Merge "Make sure hash_hmac() always works even if no secret key"

[lhc/web/wiklou.git] / includes / deferred / DataUpdate.php

diff --git a/includes/deferred/DataUpdate.php b/includes/deferred/DataUpdate.php
index 986a1f7..ed12c60 100644 (file)
--- a/includes/deferred/DataUpdate.php
+++ b/includes/deferred/DataUpdate.php
@@ -25,9 +25,9 @@
  * Abstract base class for update jobs that do something with some secondary
  * data extracted from article.
  *
- * @note: subclasses should NOT start or commit transactions in their doUpdate() method,
- *        a transaction will automatically be wrapped around the update. If need be,
- *        subclasses can override the beginTransaction() and commitTransaction() methods.
+ * @note subclasses should NOT start or commit transactions in their doUpdate() method,
+ *       a transaction will automatically be wrapped around the update. If need be,
+ *       subclasses can override the beginTransaction() and commitTransaction() methods.
  */
 abstract class DataUpdate implements DeferrableUpdate {
        /**
@@ -73,7 +73,7 @@ abstract class DataUpdate implements DeferrableUpdate {
         * This allows for limited transactional logic across multiple backends for storing
         * secondary data.
         *
-        * @param array $updates a list of DataUpdate instances
+        * @param array $updates A list of DataUpdate instances
         * @throws Exception|null
         */
        public static function runUpdates( $updates ) {
@@ -108,7 +108,8 @@ abstract class DataUpdate implements DeferrableUpdate {
                        }
                } catch ( Exception $ex ) {
                        $exception = $ex;
-                       wfDebug( "Caught exception, will rethrow after rollback: " . $ex->getMessage() );
+                       wfDebug( "Caught exception, will rethrow after rollback: " .
+                               $ex->getMessage() . "\n" );
                }
 
                // rollback remaining transactions