r70076 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r70075‎ | r70076 | r70077 >
Date:10:36, 28 July 2010
Author:werdna
Status:deferred
Tags:
Comment:
LiquidThreads: revert r69766 and friends r69774, r69803, r69804. Broken, and I would rather revert to a working version than figure out why it is broken.
Modified paths:
  • /trunk/extensions/LiquidThreads/classes/View.php (modified) (history)
  • /trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php (modified) (history)
  • /trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php (modified) (history)
  • /trunk/extensions/LiquidThreads/pages/TalkpageHistoryView.php (modified) (history)
  • /trunk/extensions/LiquidThreads/pages/TalkpageView.php (modified) (history)
  • /trunk/extensions/LiquidThreads/pages/ThreadHistoryListingView.php (modified) (history)
  • /trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php (modified) (history)

Diff [purge]

Index: trunk/extensions/LiquidThreads/classes/View.php
@@ -1208,6 +1208,11 @@
12091209 $wgOut->addScriptFile( "$wgLiquidThreadsExtensionPath/js/lqt.toolbar.js" );
12101210 $wgOut->addExtensionStyle( "$wgLiquidThreadsExtensionPath/lqt.css?{$wgStyleVersion}" );
12111211
 1212+ if ( class_exists( 'WikiEditorHooks' ) ) {
 1213+ $temp = null;
 1214+ WikiEditorHooks::addModules( $temp );
 1215+ }
 1216+
12121217 self::$stylesAndScriptsDone = true;
12131218 }
12141219
@@ -1888,10 +1893,6 @@
18891894
18901895 $html = '';
18911896
1892 - if ( wfRunHooks( 'EditPageBeforeEditToolbar', array( $html ) ) ) {
1893 - self::addJSandCSS();
1894 - }
1895 -
18961897 $html .= Xml::openElement( 'div', array( 'class' => 'lqt-thread-wrapper' ) );
18971898
18981899 $html .= Xml::element( 'a', array( 'name' => $this->anchorName( $thread ) ), ' ' );
Index: trunk/extensions/LiquidThreads/pages/TalkpageHistoryView.php
@@ -5,6 +5,7 @@
66 function show() {
77 global $wgUser;
88
 9+ self::addJSandCSS();
910 wfLoadExtensionMessages( 'LiquidThreads' );
1011
1112 $sk = $wgUser->getSkin();
Index: trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php
@@ -232,6 +232,7 @@
233233 $this->output->addFeedLink( $format, $url );
234234 }
235235
 236+ self::addJSandCSS();
236237 $this->output->setSubtitle( $this->getSubtitle() );
237238
238239 if ( $this->methodApplies( 'summarize' ) )
Index: trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
@@ -83,6 +83,8 @@
8484 }
8585
8686 function showOnce() {
 87+ self::addJSandCSS();
 88+
8789 NewMessages::recacheMessageCount( $this->user->getId() );
8890
8991 static $scriptDone = false;
Index: trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php
@@ -14,6 +14,8 @@
1515 $wgOut->setPageTitle( wfMsg( 'lqt-hot-topics' ) );
1616 $view = LqtView::getView();
1717
 18+ LqtView::addJsAndCss();
 19+
1820 // Get hot topics
1921 $topics = LqtHotTopicsController::getHotThreads();
2022
Index: trunk/extensions/LiquidThreads/pages/ThreadHistoryListingView.php
@@ -7,6 +7,7 @@
88 $this->showMissingThreadPage();
99 return false;
1010 }
 11+ self::addJSandCSS();
1112 wfLoadExtensionMessages( 'LiquidThreads' );
1213
1314 $this->thread->updateHistory();
Index: trunk/extensions/LiquidThreads/pages/TalkpageView.php
@@ -223,6 +223,7 @@
224224 wfLoadExtensionMessages( 'LiquidThreads' );
225225
226226 $this->output->setPageTitle( $this->title->getPrefixedText() );
 227+ self::addJSandCSS();
227228
228229 // Expose feed links.
229230 global $wgFeedClasses;

Follow-up revisions

RevisionCommit summaryAuthorDate
r70100re-apply r70076, WITH A FIX!mah17:59, 28 July 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r69766* Consolidate instances of LqtView::addJSandCSS() and eliminate one (apparent...mah22:54, 22 July 2010
r69774Fix r69766: Fix strict error per r69766#c7900soxred9306:48, 23 July 2010
r69803re Catrope's comments on r69766 + the strict warnings:...mah17:30, 23 July 2010
r69804re r69803, r69766: remove where WikiEditor actually hooked into LQT.mah17:34, 23 July 2010

Status & tagging log