| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -491,7 +491,7 @@ |
| 492 | 492 | $wgHooks['LoadExtensionSchemaUpdates'][] = 'FlaggedRevsHooks::addSchemaUpdates'; |
| 493 | 493 | |
| 494 | 494 | # Performance Don't show content on diff |
| 495 | | -$wgHooks['ArticleContentOnDiff'][] = 'FlaggedRevsHooks::addCustomHtml'; |
| | 495 | +$wgHooks['ArticleContentOnDiff'][] = 'FlaggedRevsHooks::onArticleContentOnDiff'; |
| 496 | 496 | |
| 497 | 497 | # ######## |
| 498 | 498 | |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.hooks.php |
| — | — | @@ -1813,14 +1813,13 @@ |
| 1814 | 1814 | /* |
| 1815 | 1815 | * If an article is reviewable, get custom article contents from the FlaggedArticleView |
| 1816 | 1816 | */ |
| 1817 | | - public static function addCustomHtml( $diffEngine, $out ) { |
| | 1817 | + public static function onArticleContentOnDiff( $diffEngine, $out ) { |
| 1818 | 1818 | $fa = FlaggedArticle::getTitleInstance( $out->getTitle() ); |
| 1819 | 1819 | if ( !$fa->isReviewable() ) { |
| 1820 | 1820 | return true; // nothing to do |
| 1821 | 1821 | } |
| 1822 | | - |
| 1823 | 1822 | $view = FlaggedArticleView::singleton(); |
| 1824 | | - $view->addCustomHtml( $out ); |
| | 1823 | + $view->addCustomContentHtml( $out ); |
| 1825 | 1824 | return false; |
| 1826 | 1825 | } |
| 1827 | 1826 | |
| Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1814,10 +1814,11 @@ |
| 1815 | 1815 | } |
| 1816 | 1816 | |
| 1817 | 1817 | /* |
| 1818 | | - * If this is a diff page then replace the article contents with a link to the specific revision. |
| 1819 | | - * This will be replaced with artice content using javascript and an api call. |
| | 1818 | + * If this is a diff page then replace the article contents with a link |
| | 1819 | + * to the specific revision. This will be replaced with article content |
| | 1820 | + * using javascript and an api call. |
| 1820 | 1821 | */ |
| 1821 | | - public function addCustomHtml( OutputPage $out ) { |
| | 1822 | + public function addCustomContentHtml( OutputPage $out ) { |
| 1822 | 1823 | global $wgTitle; |
| 1823 | 1824 | $this->load(); |
| 1824 | 1825 | if ( $out->getRevisionId() ) { |
| Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1825 | 1826 | Merged /trunk/extensions/FlaggedRevs:r77132 |