| Index: branches/wmf-deployment/extensions/LiquidThreads/classes/View.php |
| — | — | @@ -367,8 +367,14 @@ |
| 368 | 368 | $article = $thread->root(); |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | | - LqtHooks::$editTalkpage = $edit_type == 'new' |
| 372 | | - ? $this->article : $edit_applies_to->article(); |
| | 371 | + $talkpage = $this->article; |
| | 372 | + if ( $thread ) { |
| | 373 | + $talkpage = $thread->article(); |
| | 374 | + } elseif ( $edit_applies_to ) { |
| | 375 | + $talkpage = $edit_applies_to->article(); |
| | 376 | + } |
| | 377 | + |
| | 378 | + LqtHooks::$editTalkpage = $talkpage; |
| 373 | 379 | LqtHooks::$editArticle = $article; |
| 374 | 380 | LqtHooks::$editThread = $thread; |
| 375 | 381 | LqtHooks::$editType = $edit_type; |
| Property changes on: branches/wmf-deployment/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 376 | 382 | - /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /trunk/extensions/LiquidThreads:56151-57829,57831 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| 377 | 383 | + /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /trunk/extensions/LiquidThreads:56151-57829,57831,57855 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |