| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -762,25 +762,26 @@ |
| 763 | 763 | |
| 764 | 764 | $titleObj = Title::makeTitle( NS_SPECIAL, "ConfirmAccounts/{$this->specialPageParameter}" ); |
| 765 | 765 | |
| 766 | | - # Show other sub-queue links. Grey out the current one... |
| 767 | | - if( $this->showStale || $this->showRejects || $this->showHeld ) { |
| | 766 | + # Show other sub-queue links. Grey out the current one. |
| | 767 | + # When viewing a request, show them all. |
| | 768 | + if( $this->acrID || $this->showStale || $this->showRejects || $this->showHeld ) { |
| 768 | 769 | $listLink = $this->skin->makeKnownLinkObj( $titleObj, wfMsgHtml( 'confirmaccount-showopen' ) ); |
| 769 | 770 | } else { |
| 770 | 771 | $listLink = wfMsgHtml( 'confirmaccount-showopen' ); |
| 771 | 772 | } |
| 772 | | - if( !$this->showHeld ) { |
| | 773 | + if( $this->acrID || !$this->showHeld ) { |
| 773 | 774 | $listLink .= ' | '.$this->skin->makeKnownLinkObj( $titleObj, |
| 774 | 775 | wfMsgHtml( 'confirmaccount-showheld' ), wfArrayToCGI( array( 'wpShowHeld' => 1 ) ) ); |
| 775 | 776 | } else { |
| 776 | 777 | $listLink .= ' | '.wfMsgHtml( 'confirmaccount-showheld' ); |
| 777 | 778 | } |
| 778 | | - if( !$this->showRejects ) { |
| | 779 | + if( $this->acrID || !$this->showRejects ) { |
| 779 | 780 | $listLink .= ' | '.$this->skin->makeKnownLinkObj( $titleObj, wfMsgHtml( 'confirmaccount-showrej' ), |
| 780 | 781 | wfArrayToCGI( array( 'wpShowRejects' => 1 ) ) ); |
| 781 | 782 | } else { |
| 782 | 783 | $listLink .= ' | '.wfMsgHtml( 'confirmaccount-showrej' ); |
| 783 | 784 | } |
| 784 | | - if( !$this->showStale ) { |
| | 785 | + if( $this->acrID || !$this->showStale ) { |
| 785 | 786 | $listLink .= ' | '.$this->skin->makeKnownLinkObj( $titleObj, wfMsgHtml( 'confirmaccount-showexp' ), |
| 786 | 787 | wfArrayToCGI( array( 'wpShowStale' => 1 ) ) ); |
| 787 | 788 | } else { |
| — | — | @@ -1044,8 +1045,8 @@ |
| 1045 | 1046 | |
| 1046 | 1047 | $store = FileStore::get( 'accountreqs' ); |
| 1047 | 1048 | if( !$store ) { |
| 1048 | | - wfDebug( __METHOD__.": invalid storage group '{$store}'.\n" ); |
| 1049 | | - return false; |
| | 1049 | + wfDebug( __METHOD__.": invalid storage group '{$store}'.\n" ); |
| | 1050 | + return false; |
| 1050 | 1051 | } |
| 1051 | 1052 | $store->stream( $key ); |
| 1052 | 1053 | } |