X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FupdateCollation.php;h=19c1d24c7948a9858310a2bcc3dd5182ff90c150;hb=dccbb7b402af49689fec931ac8ee163dcdb8bc89;hp=7ca04b4134f17fc44037a49590f6e5c81ae95c7c;hpb=32234445e06df7ba8f7508b16feff0a58d346348;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php index 7ca04b4134..19c1d24c79 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 @@ -236,6 +238,7 @@ TEXT; $prefix .= " AND $equality"; } } + return $cond; }