| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2953,9 +2953,8 @@ |
| 2954 | 2954 | } |
| 2955 | 2955 | $called = true; |
| 2956 | 2956 | if( $this->isFileCacheable() ) { |
| 2957 | | - $touched = $this->mTouched; |
| 2958 | 2957 | $cache = new HTMLFileCache( $this->mTitle ); |
| 2959 | | - if( $cache->isFileCacheGood( $touched ) ) { |
| | 2958 | + if( $cache->isFileCacheGood( $this->mTouched ) ) { |
| 2960 | 2959 | wfDebug( "Article::tryFileCache(): about to load file\n" ); |
| 2961 | 2960 | $cache->loadFromFileCache(); |
| 2962 | 2961 | return true; |
| — | — | @@ -2978,9 +2977,8 @@ |
| 2979 | 2978 | // Get all query values |
| 2980 | 2979 | $queryVals = $wgRequest->getValues(); |
| 2981 | 2980 | foreach( $queryVals as $query => $val ) { |
| 2982 | | - if( $query == 'title' || ($query == 'action' && $val == 'view') ) { |
| 2983 | | - // Normal page view in query form |
| 2984 | | - } else { |
| | 2981 | + // Normal page view in query form can have action=view |
| | 2982 | + if( $query !== 'title' && $query !== 'curid' && !($query == 'action' && $val == 'view') ) { |
| 2985 | 2983 | return false; |
| 2986 | 2984 | } |
| 2987 | 2985 | } |
| — | — | @@ -2990,12 +2988,12 @@ |
| 2991 | 2989 | $clang = $wgContLang->getCode(); |
| 2992 | 2990 | |
| 2993 | 2991 | $cacheable = $wgUseFileCache |
| 2994 | | - && (!$wgShowIPinHeader) |
| 2995 | | - && ($this->getID() > 0) |
| 2996 | | - && ($wgUser->isAnon()) |
| 2997 | | - && (!$wgUser->getNewtalk()) |
| 2998 | | - && (!$this->mRedirectedFrom) |
| 2999 | | - && ($ulang === $clang); |
| | 2992 | + && !$wgShowIPinHeader |
| | 2993 | + && $this->getID() > 0 |
| | 2994 | + && $wgUser->isAnon() |
| | 2995 | + && !$wgUser->getNewtalk() |
| | 2996 | + && !$this->mRedirectedFrom |
| | 2997 | + && $ulang === $clang; |
| 3000 | 2998 | // Extension may have reason to disable file caching on some pages. |
| 3001 | 2999 | if( $cacheable ) { |
| 3002 | 3000 | $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) ); |