| Index: branches/wmf/1.17wmf1/includes/parser/ParserCache.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | |
| 44 | 44 | // idhash seem to mean 'page id' + 'rendering hash' (r3710) |
| 45 | 45 | $pageid = $article->getID(); |
| 46 | | - $renderkey = (int)($wgRequest->getVal('action') == 'render') + 5*(int)($wgRequest->getVal('action') == 'parse'); |
| | 46 | + $renderkey = (int)($wgRequest->getVal('action') == 'render'); |
| 47 | 47 | |
| 48 | 48 | $key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}" ); |
| 49 | 49 | return $key; |
| Index: branches/wmf/1.17wmf1/includes/Title.php |
| — | — | @@ -821,7 +821,7 @@ |
| 822 | 822 | |
| 823 | 823 | // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc) |
| 824 | 824 | // Correct fix would be to move the prepending elsewhere. |
| 825 | | - if ( $wgRequest->getVal( 'action' ) != 'render' && $wgRequest->getVal( 'action' ) != 'parse' ) { |
| | 825 | + if ( $wgRequest->getVal( 'action' ) != 'render' ) { |
| 826 | 826 | $url = $wgServer . $url; |
| 827 | 827 | } |
| 828 | 828 | } else { |
| — | — | @@ -918,12 +918,6 @@ |
| 919 | 919 | if ( $wgRequest->getVal( 'action' ) == 'render' ) { |
| 920 | 920 | $url = $wgServer . $url; |
| 921 | 921 | } |
| 922 | | - |
| 923 | | - // HACK for iOS issue: expand URLs to absolute in API action=parse |
| 924 | | - // See http://lists.wikimedia.org/pipermail/mediawiki-api/2011-September/002361.html for details |
| 925 | | - if ( $wgRequest->getVal( 'action' ) == 'parse' ) { |
| 926 | | - $url = wfExpandUrl( $url, PROTO_CANONICAL ); |
| 927 | | - } |
| 928 | 922 | } |
| 929 | 923 | wfRunHooks( 'GetLocalURL', array( &$this, &$url, $query ) ); |
| 930 | 924 | return $url; |