X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FupdateCollation.php;h=342ffbad65426a3eca436a62669e0ee612e85d5e;hb=85500c240dd18f460cdabf37b669d610cf520400;hp=7ca04b4134f17fc44037a49590f6e5c81ae95c7c;hpb=580d6f42d9835e5e64477c7f69fcd06787e9297f;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php index 7ca04b4134..342ffbad65 100644 --- a/maintenance/updateCollation.php +++ b/maintenance/updateCollation.php @@ -120,6 +120,7 @@ TEXT; } if ( $count == 0 ) { $this->output( "Collations up-to-date.\n" ); + return; } $this->output( "Fixing collation for $count rows.\n" ); @@ -150,7 +151,8 @@ TEXT; # This is an old-style row, so the sortkey needs to be # converted. if ( $row->cl_sortkey == $title->getText() - || $row->cl_sortkey == $title->getPrefixedText() ) { + || $row->cl_sortkey == $title->getPrefixedText() + ) { $prefix = ''; } else { # Custom sortkey, use it as a prefix @@ -217,6 +219,9 @@ TEXT; /** * Return an SQL expression selecting rows which sort above the given row, * 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' ); @@ -236,6 +241,7 @@ TEXT; $prefix .= " AND $equality"; } } + return $cond; }