| Index: trunk/extensions/LiquidThreads/lqt.css |
| — | — | @@ -421,6 +421,10 @@ |
| 422 | 422 | background-position: left center !important; |
| 423 | 423 | } |
| 424 | 424 | |
| | 425 | +.lqt-command-merge-to { |
| | 426 | + margin-left: 8px; |
| | 427 | +} |
| | 428 | + |
| 425 | 429 | .lqt-command-link a { |
| 426 | 430 | background-image: url(icons/link.png) !important; |
| 427 | 431 | padding-left: 26px; |
| Index: trunk/extensions/LiquidThreads/classes/View.php |
| — | — | @@ -509,7 +509,10 @@ |
| 510 | 510 | if ( $this->user->isAllowed( 'lqt-merge' ) ) { |
| 511 | 511 | $mergeParams = $_GET; |
| 512 | 512 | $mergeParams['lqt_merge_from'] = $thread->id(); |
| 513 | | - $mergeUrl = $thread->title()->getFullURL( wfArrayToCGI( $mergeParams ) ); |
| | 513 | + |
| | 514 | + unset($mergeParams['title']); |
| | 515 | + |
| | 516 | + $mergeUrl = $this->title->getFullURL( wfArrayToCGI( $mergeParams ) ); |
| 514 | 517 | $label = wfMsgExt( 'lqt-thread-merge', 'parseinline' ); |
| 515 | 518 | |
| 516 | 519 | $commands['merge'] = array( 'label' => $label, |
| Index: trunk/extensions/LiquidThreads/pages/SpecialMergeThread.php |
| — | — | @@ -92,8 +92,11 @@ |
| 93 | 93 | $this->recursiveSet( $srcThread, $newSubject, $dstThread, $dstThread ); |
| 94 | 94 | |
| 95 | 95 | $dstThread->addReply( $srcThread ); |
| 96 | | - $oldParent->removeReply( $srcThread ); |
| 97 | 96 | |
| | 97 | + if ($oldParent) { |
| | 98 | + $oldParent->removeReply( $srcThread ); |
| | 99 | + } |
| | 100 | + |
| 98 | 101 | $oldTopThread->commitRevision( Threads::CHANGE_MERGED_FROM, $srcThread, $reason ); |
| 99 | 102 | $dstThread->commitRevision( Threads::CHANGE_MERGED_TO, $srcThread, $reason ); |
| 100 | 103 | |