| Index: branches/wmf/1.18wmf1/includes/parser/ParserCache.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | |
| 50 | 50 | // idhash seem to mean 'page id' + 'rendering hash' (r3710) |
| 51 | 51 | $pageid = $article->getID(); |
| 52 | | - $renderkey = (int)($wgRequest->getVal('action') == 'render') + 5*(int)($wgRequest->getVal('action') == 'parse'); |
| | 52 | + $renderkey = (int)($wgRequest->getVal('action') == 'render'); |
| 53 | 53 | |
| 54 | 54 | $key = wfMemcKey( 'pcache', 'idhash', "{$pageid}-{$renderkey}!{$hash}" ); |
| 55 | 55 | return $key; |
| Index: branches/wmf/1.18wmf1/includes/Title.php |
| — | — | @@ -855,7 +855,7 @@ |
| 856 | 856 | |
| 857 | 857 | // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc) |
| 858 | 858 | // Correct fix would be to move the prepending elsewhere. |
| 859 | | - if ( $wgRequest->getVal( 'action' ) != 'render' && $wgRequest->getVal( 'action' ) != 'parse' ) { |
| | 859 | + if ( $wgRequest->getVal( 'action' ) != 'render' ) { |
| 860 | 860 | $url = $wgServer . $url; |
| 861 | 861 | } |
| 862 | 862 | } else { |
| — | — | @@ -953,12 +953,6 @@ |
| 954 | 954 | if ( $wgRequest->getVal( 'action' ) == 'render' ) { |
| 955 | 955 | $url = $wgServer . $url; |
| 956 | 956 | } |
| 957 | | - |
| 958 | | - // HACK for iOS issue: expand URLs to absolute in API action=parse |
| 959 | | - // See http://lists.wikimedia.org/pipermail/mediawiki-api/2011-September/002361.html for details |
| 960 | | - if ( $wgRequest->getVal( 'action' ) == 'parse' ) { |
| 961 | | - $url = wfExpandUrl( $url, PROTO_CANONICAL ); |
| 962 | | - } |
| 963 | 957 | } |
| 964 | 958 | wfRunHooks( 'GetLocalURL', array( &$this, &$url, $query ) ); |
| 965 | 959 | return $url; |
| Property changes on: branches/wmf/1.18wmf1/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 966 | 960 | Reverse-merged /branches/wmf/1.17wmf1/includes/Title.php:r98308 |