| Index: branches/wmf/1.17wmf1/maintenance/updateCollation.php |
| — | — | @@ -10,7 +10,7 @@ |
| 11 | 11 | require_once( dirname( __FILE__ ) . '/Maintenance.php' ); |
| 12 | 12 | |
| 13 | 13 | class UpdateCollation extends Maintenance { |
| 14 | | - const BATCH_SIZE = 1000; |
| | 14 | + const BATCH_SIZE = 50; |
| 15 | 15 | |
| 16 | 16 | public function __construct() { |
| 17 | 17 | parent::__construct(); |
| Property changes on: branches/wmf/1.17wmf1/maintenance/updateCollation.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 18 | 18 | Merged /branches/wmf/1.16wmf4/maintenance/updateCollation.php:r67177,69199,76243,77266 |
| 19 | 19 | Merged /branches/sqlite/maintenance/updateCollation.php:r58211-58321 |
| 20 | 20 | Merged /trunk/phase3/maintenance/updateCollation.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212,83545 |
| 21 | 21 | Merged /branches/new-installer/phase3/maintenance/updateCollation.php:r43664-66004 |
| 22 | 22 | Merged /branches/wmf-deployment/maintenance/updateCollation.php:r60970 |
| 23 | 23 | Merged /branches/REL1_15/phase3/maintenance/updateCollation.php:r51646 |
| Index: branches/wmf/1.17wmf1/includes/CategoryPage.php |
| — | — | @@ -312,7 +312,7 @@ |
| 313 | 313 | $count = 0; |
| 314 | 314 | foreach ( $res as $row ) { |
| 315 | 315 | $title = Title::newFromRow( $row ); |
| 316 | | - $rawSortkey = $title->getCategorySortkey( $row->cl_sortkey_prefix ); |
| | 316 | + $rawSortkey = $row->cl_sortkey; |
| 317 | 317 | |
| 318 | 318 | if ( ++$count > $this->limit ) { |
| 319 | 319 | # We've reached the one extra which shows that there |
| Property changes on: branches/wmf/1.17wmf1/includes/CategoryPage.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 320 | 320 | Merged /branches/new-installer/phase3/includes/CategoryPage.php:r43664-66004 |
| 321 | 321 | Merged /branches/wmf-deployment/includes/CategoryPage.php:r53381,60970 |
| 322 | 322 | Merged /branches/REL1_15/phase3/includes/CategoryPage.php:r51646 |
| 323 | 323 | Merged /branches/wmf/1.16wmf4/includes/CategoryPage.php:r67177,69199,76243,77266 |
| 324 | 324 | Merged /branches/sqlite/includes/CategoryPage.php:r58211-58321 |
| 325 | 325 | Merged /trunk/phase3/includes/CategoryPage.php:r83544 |