| Index: trunk/phase3/includes/CategoryPage.php |
| — | — | @@ -70,10 +70,14 @@ |
| 71 | 71 | function closeShowCategory() { |
| 72 | 72 | global $wgOut, $wgRequest; |
| 73 | 73 | |
| | 74 | + // Use these as defaults for back compat --catrope |
| | 75 | + $oldFrom = $wgRequest->getVal( 'from' ); |
| | 76 | + $oldUntil = $wgRequest->getVal( 'until' ); |
| | 77 | + |
| 74 | 78 | $from = $until = array(); |
| 75 | 79 | foreach ( array( 'page', 'subcat', 'file' ) as $type ) { |
| 76 | | - $from[$type] = $wgRequest->getVal( "{$type}from" ); |
| 77 | | - $until[$type] = $wgRequest->getVal( "{$type}until" ); |
| | 80 | + $from[$type] = $wgRequest->getVal( "{$type}from", $oldFrom ); |
| | 81 | + $until[$type] = $wgRequest->getVal( "{$type}until", $oldUntil ); |
| 78 | 82 | } |
| 79 | 83 | |
| 80 | 84 | $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $wgRequest->getValues() ); |
| — | — | @@ -344,7 +348,7 @@ |
| 345 | 349 | array( 'page_id', 'page_title', 'page_namespace', 'page_len', |
| 346 | 350 | 'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title', |
| 347 | 351 | 'cat_subcats', 'cat_pages', 'cat_files', 'cl_sortkey_prefix' ), |
| 348 | | - array( 'cl_to' => $this->title->getDBkey() ) + $extraConds, |
| | 352 | + array_merge( array( 'cl_to' => $this->title->getDBkey() ), $extraConds ), |
| 349 | 353 | __METHOD__, |
| 350 | 354 | array( |
| 351 | 355 | 'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ), |
| Property changes on: trunk/phase3/includes/CategoryPage.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 352 | 356 | Merged /branches/new-installer/phase3/includes/CategoryPage.php:r43664-66004 |
| 353 | 357 | Merged /branches/wmf-deployment/includes/CategoryPage.php:r53381 |
| 354 | 358 | Merged /branches/wmf/1.17wmf1/includes/CategoryPage.php:r83562 |
| 355 | 359 | Merged /branches/REL1_15/phase3/includes/CategoryPage.php:r51646 |
| 356 | 360 | Merged /branches/sqlite/includes/CategoryPage.php:r58211-58321 |