Merge "Unroll Article::__call"

diff --git a/includes/db/loadbalancer/LoadBalancer.php b/includes/db/loadbalancer/LoadBalancer.php
index 97df0d6..7199389 100644 (file)
--- a/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@ -1364,7 +1364,7 @@ class LoadBalancer {
         * case on many installations.
         *
         * @param IDatabase $conn
-        * @return int
+        * @return int|bool Returns false on error
         */
        public function safeGetLag( IDatabase $conn ) {
                if ( $this->getServerCount() == 1 ) {

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index bb3d490..b99cb41 100644 (file)
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -67,7 +67,7 @@ class LogFormatter {
        /**
         * Handy shortcut for constructing a formatter directly from
         * database row.
-        * @param object $row
+        * @param stdClass|array $row
         * @see DatabaseLogEntry::getSelectQueryData
         * @return LogFormatter
         */

diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php
index e51b434..8bac6b8 100644 (file)
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -166,22 +166,21 @@ class EmailNotification {
                        }
                }
 
-               if ( !$sendEmail ) {
-                       return;
+               if ( $sendEmail ) {
+                       JobQueueGroup::singleton()->lazyPush( new EnotifNotifyJob(
+                               $title,
+                               array(
+                                       'editor' => $editor->getName(),
+                                       'editorID' => $editor->getID(),
+                                       'timestamp' => $timestamp,
+                                       'summary' => $summary,
+                                       'minorEdit' => $minorEdit,
+                                       'oldid' => $oldid,
+                                       'watchers' => $watchers,
+                                       'pageStatus' => $pageStatus
+                               )
+                       ) );
                }
-
-               $params = array(
-                       'editor' => $editor->getName(),
-                       'editorID' => $editor->getID(),
-                       'timestamp' => $timestamp,
-                       'summary' => $summary,
-                       'minorEdit' => $minorEdit,
-                       'oldid' => $oldid,
-                       'watchers' => $watchers,
-                       'pageStatus' => $pageStatus
-               );
-               $job = new EnotifNotifyJob( $title, $params );
-               JobQueueGroup::singleton()->lazyPush( $job );
        }
 
        /**