| Index: trunk/phase3/includes/CategoryPage.php |
| — | — | @@ -68,18 +68,15 @@ |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | function closeShowCategory() { |
| 72 | | - global $wgOut; |
| | 72 | + global $wgOut, $wgRequest; |
| 73 | 73 | |
| 74 | 74 | $from = $until = array(); |
| 75 | 75 | foreach ( array( 'page', 'subcat', 'file' ) as $type ) { |
| 76 | | - # Use $_GET instead of $wgRequest, because the latter helpfully |
| 77 | | - # normalizes Unicode, which removes nulls. TODO: do something |
| 78 | | - # smarter than passing nulls in URLs. :/ |
| 79 | | - $from[$type] = isset( $_GET["{$type}from"] ) ? $_GET["{$type}from"] : null; |
| 80 | | - $until[$type] = isset( $_GET["{$type}until"] ) ? $_GET["{$type}until"] : null; |
| | 76 | + $from[$type] = $wgRequest->getVal( "{$type}from" ); |
| | 77 | + $until[$type] = $wgRequest->getVal( "{$type}until" ); |
| 81 | 78 | } |
| 82 | 79 | |
| 83 | | - $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $_GET ); |
| | 80 | + $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $wgRequest->getValues() ); |
| 84 | 81 | $wgOut->addHTML( $viewer->getHTML() ); |
| 85 | 82 | } |
| 86 | 83 | } |