| Index: trunk/extensions/LiquidThreads/LqtFunctions.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | return $html; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | | -function wfLqtBeforeWatchlistHook( &$conds, &$tables, &$join_conds, &$fields ) { |
| | 71 | +function efLqtBeforeWatchlistHook( &$conds, &$tables, &$join_conds, &$fields ) { |
| 72 | 72 | global $wgOut, $wgUser; |
| 73 | 73 | |
| 74 | 74 | if ( !in_array( 'page', $tables ) ) { |
| Index: trunk/extensions/LiquidThreads/LiquidThreads.php |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | $wgExtensionAliasesFiles['LiquidThreads'] = $dir . 'Lqt.alias.php'; |
| 43 | 43 | |
| 44 | 44 | // Hooks |
| 45 | | -$wgHooks['SpecialWatchlistQuery'][] = 'wfLqtBeforeWatchlistHook'; |
| | 45 | +$wgHooks['SpecialWatchlistQuery'][] = 'efLqtBeforeWatchlistHook'; |
| 46 | 46 | $wgHooks['MediaWikiPerformAction'][] = 'LqtDispatch::tryPage'; |
| 47 | 47 | $wgHooks['SpecialMovepageAfterMove'][] = 'LqtDispatch::onPageMove'; |
| 48 | 48 | $wgHooks['LinkerMakeLinkObj'][] = 'LqtDispatch::makeLinkObj'; |
| Index: trunk/extensions/LiquidThreads/classes/LqtDispatch.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | // non-talk article and pass that to the view. |
| 22 | 22 | $article = new Article( $title ); |
| 23 | 23 | |
| 24 | | - if ( $title->getSubjectPage()->getNamespace() == NS_LQT_THREAD ) { |
| | 24 | + if ( $title->getNamespace() == NS_LQT_THREAD + 1 /* talk page */ ) { |
| 25 | 25 | // Threads don't have talk pages; redirect to the thread page. |
| 26 | 26 | $output->redirect( $title->getSubjectPage()->getFullUrl() ); |
| 27 | 27 | } |
| — | — | @@ -34,8 +34,10 @@ |
| 35 | 35 | if ( $request->getVal( 'lqt_method', null ) === null && |
| 36 | 36 | ( in_array( $action, $header_actions ) || |
| 37 | 37 | $request->getVal( 'diff', null ) !== null ) ) { |
| | 38 | + // Pass through wrapper |
| 38 | 39 | $viewname = self::$views['TalkpageHeaderView']; |
| 39 | 40 | } else if ( $action == 'protect' || $action == 'unprotect' ) { |
| | 41 | + // Pass through wrapper |
| 40 | 42 | $viewname = self::$views['ThreadProtectionFormView']; |
| 41 | 43 | } else if ( $request->getVal( 'lqt_method' ) == 'talkpage_archive' ) { |
| 42 | 44 | $viewname = self::$views['TalkpageArchiveView']; |
| Index: trunk/extensions/LiquidThreads/pages/TalkpageHeaderView.php |
| — | — | @@ -1,6 +1,7 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | if ( !defined( 'MEDIAWIKI' ) ) die; |
| | 5 | +// Pass-through wrapper with an extra note at the top |
| 5 | 6 | |
| 6 | 7 | class TalkpageHeaderView extends LqtView { |
| 7 | 8 | function customizeTabs( $skintemplate, $content_actions ) { |
| Index: trunk/extensions/LiquidThreads/pages/ThreadProtectionFormView.php |
| — | — | @@ -2,6 +2,7 @@ |
| 3 | 3 | |
| 4 | 4 | if ( !defined( 'MEDIAWIKI' ) ) die; |
| 5 | 5 | |
| | 6 | +// Pass-through wrapper |
| 6 | 7 | class ThreadProtectionFormView { |
| 7 | 8 | function customizeTabs( $skintemplate, $content_actions ) { |
| 8 | 9 | unset( $content_actions['edit'] ); |