http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61880
Revision: 61880 Author: werdna Date: 2010-02-02 21:40:54 +0000 (Tue, 02 Feb 2010) Log Message: ----------- Merge r61879 into LiquidThreads development and production versions Modified Paths: -------------- branches/wmf-deployment/extensions/LiquidThreads/classes/NewMessagesController.php branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/NewMessagesController.php Modified: branches/wmf-deployment/extensions/LiquidThreads/classes/NewMessagesController.php =================================================================== --- branches/wmf-deployment/extensions/LiquidThreads/classes/NewMessagesController.php 2010-02-02 21:39:47 UTC (rev 61879) +++ branches/wmf-deployment/extensions/LiquidThreads/classes/NewMessagesController.php 2010-02-02 21:40:54 UTC (rev 61880) @@ -178,7 +178,8 @@ $insert_rows, __METHOD__ ); } - if ( count( $notify_users ) ) { + global $wgLqtEnotif; + if ( count( $notify_users ) && $wgLqtEnotif ) { self::notifyUsersByMail( $t, $notify_users, wfTimestampNow(), $type ); } } Modified: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/NewMessagesController.php =================================================================== --- branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/NewMessagesController.php 2010-02-02 21:39:47 UTC (rev 61879) +++ branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/NewMessagesController.php 2010-02-02 21:40:54 UTC (rev 61880) @@ -178,7 +178,8 @@ $insert_rows, __METHOD__ ); } - if ( count( $notify_users ) ) { + global $wgLqtEnotif; + if ( count( $notify_users ) && $wgLqtEnotif ) { self::notifyUsersByMail( $t, $notify_users, wfTimestampNow(), $type ); } } _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs