| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -33,10 +33,11 @@ |
| 34 | 34 | private function parseTitle() { |
| 35 | 35 | global $wgContLang; |
| 36 | 36 | |
| 37 | | - $curid = $this->context->request->getInt( 'curid' ); |
| 38 | | - $title = $this->context->request->getVal( 'title' ); |
| | 37 | + $request = $this->context->getRequest(); |
| | 38 | + $curid = $request->getInt( 'curid' ); |
| | 39 | + $title = $request->getVal( 'title' ); |
| 39 | 40 | |
| 40 | | - if ( $this->context->request->getCheck( 'search' ) ) { |
| | 41 | + if ( $request->getCheck( 'search' ) ) { |
| 41 | 42 | // Compatibility with old search URLs which didn't use Special:Search |
| 42 | 43 | // Just check for presence here, so blank requests still |
| 43 | 44 | // show the search page when using ugly URLs (bug 8054). |
| — | — | @@ -57,8 +58,8 @@ |
| 58 | 59 | // For non-special titles, check for implicit titles |
| 59 | 60 | if ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) { |
| 60 | 61 | // We can have urls with just ?diff=,?oldid= or even just ?diff= |
| 61 | | - $oldid = $this->context->request->getInt( 'oldid' ); |
| 62 | | - $oldid = $oldid ? $oldid : $this->context->request->getInt( 'diff' ); |
| | 62 | + $oldid = $request->getInt( 'oldid' ); |
| | 63 | + $oldid = $oldid ? $oldid : $request->getInt( 'diff' ); |
| 63 | 64 | // Allow oldid to override a changed or missing title |
| 64 | 65 | if ( $oldid ) { |
| 65 | 66 | $rev = Revision::newFromId( $oldid ); |
| — | — | @@ -344,7 +345,7 @@ |
| 345 | 346 | } else { |
| 346 | 347 | $n = intval( $wgJobRunRate ); |
| 347 | 348 | } |
| 348 | | - |
| | 349 | + |
| 349 | 350 | // Close the session so that jobs don't access the current session |
| 350 | 351 | $this->shutdownLBFactory(); |
| 351 | 352 | session_write_close(); |
| — | — | @@ -375,7 +376,7 @@ |
| 376 | 377 | } |
| 377 | 378 | |
| 378 | 379 | /** |
| 379 | | - * Commit pending master changes, shutdown the current loadbalancer |
| | 380 | + * Commit pending master changes, shutdown the current loadbalancer |
| 380 | 381 | * factory and destroys the factory instance. |
| 381 | 382 | */ |
| 382 | 383 | private function shutdownLBFactory() { |