| Index: trunk/extensions/Contest/specials/SpecialContestWelcome.php |
| — | — | @@ -142,13 +142,11 @@ |
| 143 | 143 | $challenges[] = $data; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | | - global $wgContestDeletionEnabled; |
| 147 | | - $this->getOutput()->addScript( |
| | 146 | + $output->addScript( |
| 148 | 147 | Skin::makeVariablesScript( |
| 149 | 148 | array( |
| 150 | 149 | 'ContestChallenges' => $challenges, |
| 151 | 150 | 'ContestConfig' => array(), |
| 152 | | - 'ContestDeletionEnabled' => $wgContestDeletionEnabled, |
| 153 | 151 | ) |
| 154 | 152 | ) |
| 155 | 153 | ); |
| Index: trunk/extensions/Contest/specials/SpecialEditContest.php |
| — | — | @@ -95,6 +95,14 @@ |
| 96 | 96 | protected function showContent( $subPage ) { |
| 97 | 97 | $isNew = $this->getRequest()->wasPosted() && $this->getUser()->matchEditToken( $this->getRequest()->getVal( 'newEditToken' ) ); |
| 98 | 98 | |
| | 99 | + global $wgContestDeletionEnabled; |
| | 100 | + $this->getOutput()->addScript( |
| | 101 | + Skin::makeVariablesScript( |
| | 102 | + array( |
| | 103 | + 'ContestDeletionEnabled' => $wgContestDeletionEnabled, |
| | 104 | + ) |
| | 105 | + ) |
| | 106 | + ); |
| 99 | 107 | if ( $isNew ) { |
| 100 | 108 | $data = array( 'name' => $this->getRequest()->getVal( 'newcontest' ) ); |
| 101 | 109 | |
| Index: trunk/extensions/Contest/resources/contest.special.editcontest.js |
| — | — | @@ -89,9 +89,8 @@ |
| 90 | 90 | return false; |
| 91 | 91 | } |
| 92 | 92 | } ); |
| | 93 | + $this.append( this.deleteButton ); |
| 93 | 94 | } |
| 94 | | - |
| 95 | | - $this.append( this.deleteButton ); |
| 96 | 95 | }; |
| 97 | 96 | |
| 98 | 97 | this.init(); |