http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70100
Revision: 70100
Author: mah
Date: 2010-07-28 17:59:16 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
re-apply r70076, WITH A FIX!
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 17:49:06 UTC
(rev 70099)
+++ trunk/extensions/LiquidThreads/classes/View.php 2010-07-28 17:59:16 UTC
(rev 70100)
@@ -1208,11 +1208,6 @@
$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;
}
@@ -1892,6 +1887,9 @@
$replyTo = $this->methodAppliesToThread( 'reply', $thread );
$html = '';
+ if ( wfRunHooks( 'EditPageBeforeEditToolbar', array( &$html ) )
) {
+ self::addJSandCSS();
+ }
$class = $this->threadDivClass( $thread );
if ( $levelNum == 1 ) {
@@ -1905,7 +1903,7 @@
} else {
$class .= ' lqt-thread-no-subthreads';
}
-
+
$class .= ' lqt-thread-wrapper';
$html .= Xml::openElement(
@@ -1915,7 +1913,7 @@
'id' => 'lqt_thread_id_' . $thread->id()
)
);
-
+
$html .= Xml::element( 'a', array( 'name' => $this->anchorName(
$thread ) ), ' ' );
$html .= $this->showThreadHeading( $thread );
Modified: trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
2010-07-28 17:49:06 UTC (rev 70099)
+++ trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
2010-07-28 17:59:16 UTC (rev 70100)
@@ -83,8 +83,6 @@
}
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
17:49:06 UTC (rev 70099)
+++ trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php 2010-07-28
17:59:16 UTC (rev 70100)
@@ -14,8 +14,6 @@
$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 17:49:06 UTC (rev 70099)
+++ trunk/extensions/LiquidThreads/pages/TalkpageHistoryView.php
2010-07-28 17:59:16 UTC (rev 70100)
@@ -5,7 +5,6 @@
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
17:49:06 UTC (rev 70099)
+++ trunk/extensions/LiquidThreads/pages/TalkpageView.php 2010-07-28
17:59:16 UTC (rev 70100)
@@ -223,7 +223,6 @@
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 17:49:06 UTC (rev 70099)
+++ trunk/extensions/LiquidThreads/pages/ThreadHistoryListingView.php
2010-07-28 17:59:16 UTC (rev 70100)
@@ -7,7 +7,6 @@
$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 17:49:06 UTC (rev 70099)
+++ trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php
2010-07-28 17:59:16 UTC (rev 70100)
@@ -232,7 +232,6 @@
$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
