MarkAHershberger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97670


Change subject: Move reference to $row where it is in-scope and doesn't produce 
E_STRICT notices.
......................................................................

Move reference to $row where it is in-scope and doesn't produce
E_STRICT notices.

Bug: 57575
Change-Id: Ic508ebbb0816acd32be355b5f19b46637d58c36a
---
M maintenance/updateCollation.php
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/97670/1

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 964b313..982656b 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -47,7 +47,7 @@
                $this->mDescription = <<<TEXT
 This script will find all rows in the categorylinks table whose collation is
 out-of-date (cl_collation != '$wgCategoryCollation') and repopulate cl_sortkey
-using the page title and cl_sortkey_prefix.  If everything's collation is
+using the page title and cl_sortkey_prefix.  If all collations are
 up-to-date, it will do nothing.
 TEXT;
 
@@ -188,13 +188,12 @@
                                                __METHOD__
                                        );
                                }
+                               if ( $row ) {
+                                       $batchConds = array( 
$this->getBatchCondition( $row ) );
+                               }
                        }
                        if ( !$dryRun ) {
                                $dbw->commit( __METHOD__ );
-                       }
-
-                       if ( $row ) {
-                               $batchConds = array( $this->getBatchCondition( 
$row ) );
                        }
 
                        $count += $res->numRows();

-- 
To view, visit https://gerrit.wikimedia.org/r/97670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic508ebbb0816acd32be355b5f19b46637d58c36a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to