| Index: trunk/phase3/includes/CategoryPage.php |
| — | — | @@ -68,14 +68,27 @@ |
| 69 | 69 | // Use these as defaults for back compat --catrope |
| 70 | 70 | $oldFrom = $wgRequest->getVal( 'from' ); |
| 71 | 71 | $oldUntil = $wgRequest->getVal( 'until' ); |
| | 72 | + |
| | 73 | + $reqArray = $wgRequest->getValues(); |
| 72 | 74 | |
| 73 | 75 | $from = $until = array(); |
| 74 | 76 | foreach ( array( 'page', 'subcat', 'file' ) as $type ) { |
| 75 | 77 | $from[$type] = $wgRequest->getVal( "{$type}from", $oldFrom ); |
| 76 | 78 | $until[$type] = $wgRequest->getVal( "{$type}until", $oldUntil ); |
| | 79 | + |
| | 80 | + // Do not want old-style from/until propagating in nav links. |
| | 81 | + if ( !isset( $reqArray["{$type}from"] ) && isset( $reqArray["from"] ) ) { |
| | 82 | + $reqArray["{$type}from"] = $reqArray["from"]; |
| | 83 | + } |
| | 84 | + if ( !isset( $reqArray["{$type}to"] ) && isset( $reqArray["to"] ) ) { |
| | 85 | + $reqArray["{$type}to"] = $reqArray["to"]; |
| | 86 | + } |
| 77 | 87 | } |
| 78 | 88 | |
| 79 | | - $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $wgRequest->getValues() ); |
| | 89 | + unset( $reqArray["from"] ); |
| | 90 | + unset( $reqArray["to"] ); |
| | 91 | + |
| | 92 | + $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $reqArray ); |
| 80 | 93 | $wgOut->addHTML( $viewer->getHTML() ); |
| 81 | 94 | } |
| 82 | 95 | } |