| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -857,9 +857,7 @@ |
| 858 | 858 | '<span class="redirectText">'.$link.'</span>' ); |
| 859 | 859 | |
| 860 | 860 | $parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser)); |
| 861 | | - $catlinks = $parseout->getCategoryLinks(); |
| 862 | | - $wgOut->addCategoryLinks($catlinks); |
| 863 | | - $skin = $wgUser->getSkin(); |
| | 861 | + $wgOut->addParserOutputNoText( $parseout ); |
| 864 | 862 | } else if ( $pcache ) { |
| 865 | 863 | # Display content and save to parser cache |
| 866 | 864 | $wgOut->setRevisionId( $this->getRevIdFetched() ); |
| — | — | @@ -1328,16 +1326,10 @@ |
| 1329 | 1327 | |
| 1330 | 1328 | $isminor = ( $minor && $wgUser->isLoggedIn() ); |
| 1331 | 1329 | if ( $this->isRedirect( $text ) ) { |
| 1332 | | - # Remove all content but redirect |
| 1333 | | - # This could be done by reconstructing the redirect from a title given by |
| 1334 | | - # Title::newFromRedirect(), but then we wouldn't know which synonym the user |
| 1335 | | - # wants to see |
| 1336 | | - if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ')[^\\n]+)/i', $text, $m ) ) { |
| 1337 | | - $redir = 1; |
| 1338 | | - $text = $m[1] . "\n"; |
| 1339 | | - } |
| | 1330 | + $redir = 1; |
| | 1331 | + } else { |
| | 1332 | + $redir = 0; |
| 1340 | 1333 | } |
| 1341 | | - else { $redir = 0; } |
| 1342 | 1334 | |
| 1343 | 1335 | $text = $this->preSaveTransform( $text ); |
| 1344 | 1336 | $dbw =& wfGetDB( DB_MASTER ); |