http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70076
Revision: 70076
Author: werdna
Date: 2010-07-28 10:36:40 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
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
trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php
trunk/extensions/LiquidThreads/pages/TalkpageHistoryView.php
trunk/extensions/LiquidThreads/pages/TalkpageView.php
trunk/extensions/LiquidThreads/pages/ThreadHistoryListingView.php
trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php
Modified: trunk/extensions/LiquidThreads/classes/View.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/View.php 2010-07-28 10:02:34 UTC
(rev 70075)
+++ trunk/extensions/LiquidThreads/classes/View.php 2010-07-28 10:36:40 UTC
(rev 70076)
@@ -1208,6 +1208,11 @@
$wgOut->addScriptFile(
"$wgLiquidThreadsExtensionPath/js/lqt.toolbar.js" );
$wgOut->addExtensionStyle(
"$wgLiquidThreadsExtensionPath/lqt.css?{$wgStyleVersion}" );
+ if ( class_exists( 'WikiEditorHooks' ) ) {
+ $temp = null;
+ WikiEditorHooks::addModules( $temp );
+ }
+
self::$stylesAndScriptsDone = true;
}
@@ -1888,10 +1893,6 @@
$html = '';
- if ( wfRunHooks( 'EditPageBeforeEditToolbar', array( $html ) )
) {
- self::addJSandCSS();
- }
-
$html .= Xml::openElement( 'div', array( 'class' =>
'lqt-thread-wrapper' ) );
$html .= Xml::element( 'a', array( 'name' => $this->anchorName(
$thread ) ), ' ' );
Modified: trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
2010-07-28 10:02:34 UTC (rev 70075)
+++ trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
2010-07-28 10:36:40 UTC (rev 70076)
@@ -83,6 +83,8 @@
}
function showOnce() {
+ self::addJSandCSS();
+
NewMessages::recacheMessageCount( $this->user->getId() );
static $scriptDone = false;
Modified: trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php 2010-07-28
10:02:34 UTC (rev 70075)
+++ trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php 2010-07-28
10:36:40 UTC (rev 70076)
@@ -14,6 +14,8 @@
$wgOut->setPageTitle( wfMsg( 'lqt-hot-topics' ) );
$view = LqtView::getView();
+ LqtView::addJsAndCss();
+
// Get hot topics
$topics = LqtHotTopicsController::getHotThreads();
Modified: trunk/extensions/LiquidThreads/pages/TalkpageHistoryView.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/TalkpageHistoryView.php
2010-07-28 10:02:34 UTC (rev 70075)
+++ trunk/extensions/LiquidThreads/pages/TalkpageHistoryView.php
2010-07-28 10:36:40 UTC (rev 70076)
@@ -5,6 +5,7 @@
function show() {
global $wgUser;
+ self::addJSandCSS();
wfLoadExtensionMessages( 'LiquidThreads' );
$sk = $wgUser->getSkin();
Modified: trunk/extensions/LiquidThreads/pages/TalkpageView.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/TalkpageView.php 2010-07-28
10:02:34 UTC (rev 70075)
+++ trunk/extensions/LiquidThreads/pages/TalkpageView.php 2010-07-28
10:36:40 UTC (rev 70076)
@@ -223,6 +223,7 @@
wfLoadExtensionMessages( 'LiquidThreads' );
$this->output->setPageTitle( $this->title->getPrefixedText() );
+ self::addJSandCSS();
// Expose feed links.
global $wgFeedClasses;
Modified: trunk/extensions/LiquidThreads/pages/ThreadHistoryListingView.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/ThreadHistoryListingView.php
2010-07-28 10:02:34 UTC (rev 70075)
+++ trunk/extensions/LiquidThreads/pages/ThreadHistoryListingView.php
2010-07-28 10:36:40 UTC (rev 70076)
@@ -7,6 +7,7 @@
$this->showMissingThreadPage();
return false;
}
+ self::addJSandCSS();
wfLoadExtensionMessages( 'LiquidThreads' );
$this->thread->updateHistory();
Modified: trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php
2010-07-28 10:02:34 UTC (rev 70075)
+++ trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php
2010-07-28 10:36:40 UTC (rev 70076)
@@ -232,6 +232,7 @@
$this->output->addFeedLink( $format, $url );
}
+ self::addJSandCSS();
$this->output->setSubtitle( $this->getSubtitle() );
if ( $this->methodApplies( 'summarize' ) )
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
