r57292 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r57291‎ | r57292 | r57293 >
Date:14:56, 2 October 2009
Author:werdna
Status:deferred
Tags:
Comment:
Merge r57287.
Modified paths:
  • /branches/wmf-deployment/extensions/LiquidThreads (modified) (history)
  • /branches/wmf-deployment/extensions/LiquidThreads/pages/NewUserMessagesView.php (modified) (history)
  • /branches/wmf-deployment/extensions/LiquidThreads/pages/SpecialNewMessages.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/LiquidThreads/pages/NewUserMessagesView.php
@@ -111,11 +111,6 @@
112112 if ( ! is_array( $this->threads ) ) {
113113 throw new MWException( 'You must use NewUserMessagesView::setThreads() before calling NewUserMessagesView::show().' );
114114 }
115 -
116 - if ( $this->request->getBool( 'lqt_inline' ) ) {
117 - $this->doInlineEditForm();
118 - return false;
119 - }
120115
121116 // Do everything by id, because we can't depend on reference identity; a simple Thread::withId
122117 // can change the cached value and screw up your references.
Index: branches/wmf-deployment/extensions/LiquidThreads/pages/SpecialNewMessages.php
@@ -32,6 +32,11 @@
3333
3434 $view = new NewUserMessagesView( $this->output, $article,
3535 $title, $this->user, $this->request );
 36+
 37+ if ( $this->request->getBool( 'lqt_inline' ) ) {
 38+ $view->doInlineEditForm();
 39+ return;
 40+ }
3641
3742 $view->showOnce(); // handles POST etc.
3843
Property changes on: branches/wmf-deployment/extensions/LiquidThreads
___________________________________________________________________
Name: svn:mergeinfo
3944 - /branches/REL1_15/phase3/extensions/LiquidThreads:51646
/trunk/extensions/LiquidThreads:56151-57116,57130-57134,57169,57193,57195,57198,57200-57206,57215,57219,57222,57225,57227,57229
/trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
4045 + /branches/REL1_15/phase3/extensions/LiquidThreads:51646
/trunk/extensions/LiquidThreads:56151-57116,57130-57134,57169,57193,57195,57198,57200-57206,57215,57219,57222,57225,57227,57229,57287
/trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r57287Move inline functionality further up the tree in NewMessages, fixes bug where...werdna11:38, 2 October 2009

Status & tagging log