| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -678,9 +678,6 @@ |
| 679 | 679 | |
| 680 | 680 | wfProfileIn( __METHOD__ ); |
| 681 | 681 | |
| 682 | | - $parserCache = ParserCache::singleton(); |
| 683 | | - $ns = $this->mTitle->getNamespace(); # shortcut |
| 684 | | - |
| 685 | 682 | # Get variables from query string |
| 686 | 683 | $oldid = $this->getOldID(); |
| 687 | 684 | |
| — | — | @@ -688,6 +685,7 @@ |
| 689 | 686 | if( $oldid === 0 && $this->checkTouched() ) { |
| 690 | 687 | global $wgUseETag; |
| 691 | 688 | if( $wgUseETag ) { |
| | 689 | + $parserCache = ParserCache::singleton(); |
| 692 | 690 | $wgOut->setETag( $parserCache->getETag($this,$wgUser) ); |
| 693 | 691 | } |
| 694 | 692 | if( $wgOut->checkLastModified( $this->getTouched() ) ){ |
| — | — | @@ -702,6 +700,7 @@ |
| 703 | 701 | } |
| 704 | 702 | } |
| 705 | 703 | |
| | 704 | + $ns = $this->mTitle->getNamespace(); # shortcut |
| 706 | 705 | $sk = $wgUser->getSkin(); |
| 707 | 706 | |
| 708 | 707 | # getOldID may want us to redirect somewhere else |