| Index: trunk/extensions/LiquidThreads/LiquidThreads.php |
| — | — | @@ -41,7 +41,6 @@ |
| 42 | 42 | $wgHooks['SpecialMovepageAfterMove'][] = 'LqtDispatch::onPageMove'; |
| 43 | 43 | $wgHooks['LinkerMakeLinkObj'][] = 'LqtDispatch::makeLinkObj'; |
| 44 | 44 | $wgHooks['SkinTemplateTabAction'][] = 'LqtDispatch::tabAction'; |
| 45 | | -//$wgHooks['ChangesListInsertArticleLink'][] = 'LqtDispatch::changesListArticleLink'; |
| 46 | 45 | $wgHooks['OldChangesListRecentChangesLine'][] = 'LqtDispatch::customizeOldChangesList'; |
| 47 | 46 | $wgHooks['SkinTemplateOutputPageBeforeExec'][] = 'LqtDispatch::setNewtalkHTML'; |
| 48 | 47 | |
| Index: trunk/extensions/LiquidThreads/Lqt.i18n.php |
| — | — | @@ -56,11 +56,9 @@ |
| 57 | 57 | 'lqt_change_reply_created' => 'The highlighted comment was created in this revision.', |
| 58 | 58 | 'lqt_change_edited_root' => 'The highlighted comment was edited in this revision.', |
| 59 | 59 | 'lqt_youhavenewmessages' => 'You have [$1 new messages].', |
| 60 | | - 'lqt_changes_from' => ' from ', |
| 61 | | - 'lqt_changes_summary_of' => ' of ', |
| 62 | 60 | 'lqt_protectedfromreply' => 'This thread has been $1 from being replied to.', |
| 63 | 61 | 'lqt_protectedfromreply_link' => 'protected', |
| 64 | | - 'lqt_subject' => 'Subject: ', |
| | 62 | + 'lqt_subject' => 'Subject:', |
| 65 | 63 | 'lqt_nosubject' => '«no subject»', |
| 66 | 64 | 'lqt_noreason' => 'No reason given.', |
| 67 | 65 | 'lqt_move_placeholder' => 'This thread is a placeholder indicating that a thread, $1, was removed from this page to another talk page. |
| — | — | @@ -2762,7 +2760,7 @@ |
| 2763 | 2761 | 'lqt_new_thread' => 'Start ein ny diskusjon', |
| 2764 | 2762 | 'lqt_in_response_to' => 'Som svar til $1 av $2, over:', |
| 2765 | 2763 | 'lqt_edited_notice' => 'Endra', |
| 2766 | | - 'lqt_move_placeholder' => 'Denne tråden finst berre for å syna at tråden $1 vart flytt frå denne sida til ei anna diskusjonssida. |
| | 2764 | + 'lqt_move_placeholder' => 'Denne tråden finst berre for å syna at tråden $1 vart flytt frå denne sida til ei anna diskusjonssida. |
| 2767 | 2765 | Flyttinga vart gjort av $2 $3.', |
| 2768 | 2766 | 'lqt_reply' => 'Svar', |
| 2769 | 2767 | 'lqt_delete' => 'Slett', |
| Index: trunk/extensions/LiquidThreads/LqtBaseView.php |
| — | — | @@ -174,47 +174,14 @@ |
| 175 | 175 | return true; |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | | - static function changesListArticleLink(&$changeslist, &$articlelink, &$s, &$rc, $unpatrolled, $watched) { |
| 179 | | - $thread = null; |
| 180 | | - |
| 181 | | - /* What an utter crock of shit. |
| 182 | | - The first row for a given date has the date plus the <ul> tag inside what's |
| 183 | | - supposed to be the individual row HTML, $s. */ |
| 184 | | - |
| 185 | | -/* var_dump($s); |
| 186 | | - $articlelink = '<span style="color:orange;">Yo</span>'; |
| 187 | | - return true;*/ |
| 188 | | - |
| 189 | | - if( $rc->getTitle()->getNamespace() == NS_LQT_THREAD ) { |
| 190 | | - $thread = Threads::withRoot(new Post( $rc->getTitle() )); |
| 191 | | - if($thread) { |
| 192 | | - wfLoadExtensionMessages( 'LiquidThreads' ); |
| 193 | | - $msg = wfMsg('lqt_changes_from'); |
| 194 | | - $link = $thread->article()->getTitle()->getTalkPage(); |
| 195 | | - } |
| 196 | | - } |
| 197 | | - else if( $rc->getTitle()->getNamespace() == NS_LQT_SUMMARY ) { |
| 198 | | - $thread = Threads::withSummary(new Article( $rc->getTitle() )); |
| 199 | | - if($thread) { |
| 200 | | - wfLoadExtensionMessages( 'LiquidThreads' ); |
| 201 | | - $msg = wfMsg('lqt_changes_summary_of'); |
| 202 | | - $link = $thread->title(); |
| 203 | | - } |
| 204 | | - } |
| 205 | | - if($thread) { |
| 206 | | - $articlelink .= $msg . $changeslist->skin->makeKnownLinkObj( $link ); |
| 207 | | - } |
| 208 | | - return true; |
| 209 | | - } |
| 210 | | - |
| 211 | 178 | static function customizeOldChangesList(&$changeslist, &$s, &$rc) { |
| 212 | 179 | if( $rc->getTitle()->getNamespace() == NS_LQT_THREAD ) { |
| 213 | 180 | $thread = Threads::withRoot(new Post( $rc->getTitle() )); |
| 214 | 181 | if( !$thread ) return true; |
| 215 | | - |
| | 182 | + |
| 216 | 183 | LqtView::addJSandCSS(); // TODO only do this once. |
| 217 | 184 | wfLoadExtensionMessages( 'LiquidThreads' ); |
| 218 | | - |
| | 185 | + |
| 219 | 186 | if( $rc->mAttribs['rc_type'] != RC_NEW ) { |
| 220 | 187 | // Add whether it was original author. |
| 221 | 188 | // TODO: this only asks whether ANY edit has been by another, not this edit. |
| — | — | @@ -239,7 +206,7 @@ |
| 240 | 207 | array('class'=>'lqt_rc_ellipsis'), array(), array('known')); |
| 241 | 208 | } |
| 242 | 209 | // TODO we must parse or sanitize the quote. |
| 243 | | - |
| | 210 | + |
| 244 | 211 | if( $thread->isTopmostThread() ) { |
| 245 | 212 | $message_name = 'lqt_rc_new_discussion'; |
| 246 | 213 | $tmp_title = $thread->title(); |
| — | — | @@ -248,17 +215,17 @@ |
| 249 | 216 | $tmp_title = $thread->topmostThread()->title(); |
| 250 | 217 | $tmp_title->setFragment( '#' . LqtView::anchorName( $thread ) ); |
| 251 | 218 | } |
| 252 | | - |
| | 219 | + |
| 253 | 220 | $thread_link = $changeslist->skin->link( |
| 254 | 221 | $tmp_title, |
| 255 | 222 | $thread->subjectWithoutIncrement(), |
| 256 | 223 | array(), array(), array('known')); |
| 257 | | - |
| | 224 | + |
| 258 | 225 | $talkpage_link = $changeslist->skin->link( |
| 259 | 226 | $thread->article()->getTitle()->getTalkPage(), |
| 260 | | - null, |
| | 227 | + null, |
| 261 | 228 | array(), array(), array('known')); |
| 262 | | - |
| | 229 | + |
| 263 | 230 | $s = wfMsg($message_name, $thread_link, $talkpage_link, $sig) |
| 264 | 231 | . "<blockquote class=\"lqt_rc_blockquote\">$quote</blockquote>"; |
| 265 | 232 | } |