| Index: trunk/extensions/DeleteQueue/DeleteQueue.i18n.php |
| — | — | @@ -119,6 +119,8 @@ |
| 120 | 120 | |
| 121 | 121 | A [{{fullurl:{{FULLPAGENAME}}|action=delviewvotes}} list] of endorsements and objections of this deletion is available, and the discussion itself can be found at [[$2]]. |
| 122 | 122 | Please ensure that you make a decision in accordance with the consensus on the discussion.", |
| | 123 | + 'deletequeue-review-success' => 'You have successfully reviewed the deletion of this page', |
| | 124 | + 'deletequeue-review-success-title' => 'Review complete', |
| 123 | 125 | |
| 124 | 126 | // Deletion discussions |
| 125 | 127 | 'deletequeue-deletediscuss-discussionpage' => "This is the discussion page for the deletion of [[$1]]. |
| Index: trunk/extensions/DeleteQueue/ReviewForm.php |
| — | — | @@ -27,13 +27,14 @@ |
| 28 | 28 | $action = $wgRequest->getVal( 'wpSpeedyAction' ); |
| 29 | 29 | $processed = true; |
| 30 | 30 | $dqi = DeleteQueueItem::newFromArticle( $article ); |
| | 31 | + $newQueue = $wgRequest->getVal( 'wpSpeedyRequeue' ); |
| 31 | 32 | |
| 32 | 33 | $lp = new LogPage( 'delete' ); |
| 33 | 34 | $reason = $wgRequest->getText( 'wpReason' ); |
| 34 | 35 | |
| 35 | 36 | // Check the action against the list |
| 36 | 37 | list($enabledActions) = $this->availableActions(); |
| 37 | | - if (!in_array($action,$enabledActions)) { |
| | 38 | + if ( !in_array( $action,$enabledActions ) && ( $action != 'requeue' || !in_array( "requeue-$newQueue", $enabledActions ) ) ) { |
| 38 | 39 | return wfMsg( 'deletequeue-review-actiondenied' ); |
| 39 | 40 | } |
| 40 | 41 | |
| — | — | @@ -59,8 +60,6 @@ |
| 60 | 61 | $processed = true; |
| 61 | 62 | break; |
| 62 | 63 | case 'requeue': |
| 63 | | - $newQueue = $wgRequest->getVal( 'wpSpeedyRequeue' ); |
| 64 | | - |
| 65 | 64 | $lp->addEntry( 'requeue', $article->mTitle, $reason, array(wfMsgForContent("deletequeue-queue-$queue"), wfMsgForContent( "deletequeue-queue-{$newQueue}" )) ); |
| 66 | 65 | |
| 67 | 66 | list($reason1,$reason2) = array($wgRequest->getText( 'wpSpeedyNewReason' ), $wgRequest->getText( 'wpSpeedyNewExtra' ) ); |
| — | — | @@ -138,6 +137,8 @@ |
| 139 | 138 | } |
| 140 | 139 | |
| 141 | 140 | if (($error = $this->submit( $article )) === true) { |
| | 141 | + $wgOut->setPageTitle( wfMsg( "deletequeue-review-success-title" ) ); |
| | 142 | + $wgOut->addWikiMsg( "deletequeue-review-success" ); |
| 142 | 143 | return; |
| 143 | 144 | } |
| 144 | 145 | |
| — | — | @@ -224,7 +225,7 @@ |
| 225 | 226 | |
| 226 | 227 | $wgOut->addHTML( $output ); |
| 227 | 228 | |
| 228 | | - $article->showLogExtract( $wgOut ); |
| | 229 | +// $article->showLogExtract( $wgOut ); |
| 229 | 230 | } |
| 230 | 231 | |
| 231 | 232 | /** Returns the action given in enabledText, a 'disabled' message, or nothing, depending on the status of the action. */ |
| — | — | @@ -299,7 +300,7 @@ |
| 300 | 301 | // Tell them they're involved. |
| 301 | 302 | $disabled['delete'] = wfMsgExt( 'deletequeue-actiondisabled-involved', array( 'parseinline' ), array( $descriptiveRolesText ) ); |
| 302 | 303 | } else { |
| 303 | | - // An uninvolved admin wants to delete an expired proposed deletion. Kill it. |
| | 304 | + // Allow uninvolved admins to delete expired prods |
| 304 | 305 | $enabled[] = 'delete'; |
| 305 | 306 | } |
| 306 | 307 | } elseif ($queue == 'deletediscuss') { |
| Index: trunk/extensions/DeleteQueue/DeleteQueueItem.php |
| — | — | @@ -362,9 +362,6 @@ |
| 363 | 363 | */ |
| 364 | 364 | public function setQueue( $queue, $reason, $timestamp = null ) { |
| 365 | 365 | |
| 366 | | - if (!$this->getCaseID()) |
| 367 | | - return; // Case doesn't exist anymore. |
| 368 | | - |
| 369 | 366 | $dbw = wfGetDB( DB_MASTER ); |
| 370 | 367 | |
| 371 | 368 | if ($timestamp == null) { |
| Index: trunk/extensions/DeleteQueue/DeleteQueueInterface.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | |
| 37 | 37 | if ($form) { |
| 38 | 38 | $wgOut->addHTML( $form ); |
| 39 | | - $article->showLogExtract( $wgOut ); |
| | 39 | +// $article->showLogExtract( $wgOut ); |
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | $form = Xml::tags( 'form', array( 'action' => $article->mTitle->getLocalUrl(), 'method' => 'POST' ), $form ); |
| 69 | 69 | |
| 70 | 70 | $wgOut->addHTML( $form ); |
| 71 | | - $article->showLogExtract( $wgOut ); |
| | 71 | +// $article->showDeletionLog(); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |