| Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php |
| — | — | @@ -473,18 +473,6 @@ |
| 474 | 474 | return true; |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | | - public static function addModulesForThread( $thread, $levelNum, $totalInLevel, $options ) { |
| 478 | | - static $firstRun = true; |
| 479 | | - |
| 480 | | - if( $firstRun ) { |
| 481 | | - $temp = null; |
| 482 | | - WikiEditorHooks::addModules( $temp ); |
| 483 | | - $firstRun = false; |
| 484 | | - } |
| 485 | | - |
| 486 | | - return true; |
| 487 | | - } |
| 488 | | - |
| 489 | 477 | /** |
| 490 | 478 | * GetPreferences hook |
| 491 | 479 | * Add module-releated items to the preferences |
| Index: trunk/extensions/LiquidThreads/classes/View.php |
| — | — | @@ -1900,6 +1900,10 @@ |
| 1901 | 1901 | $sk = $this->user->getSkin(); |
| 1902 | 1902 | $html = ''; |
| 1903 | 1903 | |
| | 1904 | + if ( wfRunHooks( 'EditPageBeforeEditToolbar', array( $html ) ) ) { |
| | 1905 | + self::addJSandCSS(); |
| | 1906 | + } |
| | 1907 | + |
| 1904 | 1908 | $html .= Xml::openElement( 'div', array( 'class' => 'lqt-thread-wrapper' ) ); |
| 1905 | 1909 | |
| 1906 | 1910 | $html .= Xml::element( 'a', array( 'name' => $this->anchorName( $thread ) ), ' ' ); |
| — | — | @@ -1958,10 +1962,6 @@ |
| 1959 | 1963 | ) |
| 1960 | 1964 | ); |
| 1961 | 1965 | |
| 1962 | | - if ( wfRunHooks( 'LiquidThreadsShowThread', array( $thread, $levelNum, $totalInLevel, $options ) ) ) { |
| 1963 | | - self::addJSandCSS(); |
| 1964 | | - } |
| 1965 | | - |
| 1966 | 1966 | // Flush output to display thread |
| 1967 | 1967 | $this->output->addHTML( $html ); |
| 1968 | 1968 | $this->output->addHTML( Xml::openElement( 'div', |