Merge "build: Enable jscs jsDoc rule 'checkParamNames' and make pass"

[lhc/web/wiklou.git] / maintenance / updateCollation.php

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 5bee7f9..5cf8afa 100644 (file)
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -24,8 +24,6 @@
  * @author Aryeh Gregor (Simetrical)
  */
 
-#$optionsWithArgs = array( 'begin', 'max-slave-lag' );
-
 require_once __DIR__ . '/Maintenance.php';
 
 /**
@@ -221,6 +219,7 @@ TEXT;
         * assuming an ordering of cl_to, cl_type, cl_from
         * @param stdClass $row
         * @param DatabaseBase $dbw
+        * @return string
         */
        function getBatchCondition( $row, $dbw ) {
                $fields = array( 'cl_to', 'cl_type', 'cl_from' );