| Index: trunk/phase3/includes/ChangesFeed.php |
| — | — | @@ -34,6 +34,11 @@ |
| 35 | 35 | return false; |
| 36 | 36 | } |
| 37 | 37 | |
| | 38 | + if( !array_key_exists( $this->format, $wgFeedClasses ) ) { |
| | 39 | + // falling back to atom |
| | 40 | + $this->format = 'atom'; |
| | 41 | + } |
| | 42 | + |
| 38 | 43 | $feedTitle = "$wgSitename - {$title} [$wgLanguageCode]"; |
| 39 | 44 | return new $wgFeedClasses[$this->format]( |
| 40 | 45 | $feedTitle, htmlspecialchars( $description ), $url ); |
| Index: trunk/phase3/includes/FileDeleteForm.php |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | return; |
| 39 | 39 | } |
| 40 | 40 | $permission_errors = $this->title->getUserPermissionsErrors('delete', $wgUser); |
| 41 | | - if (count($permission_errors)>0) { |
| | 41 | + if ( count( $permission_errors ) > 0 ) { |
| 42 | 42 | $wgOut->showPermissionsErrorPage( $permission_errors ); |
| 43 | 43 | return; |
| 44 | 44 | } |
| — | — | @@ -74,8 +74,12 @@ |
| 75 | 75 | |
| 76 | 76 | $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress ); |
| 77 | 77 | |
| 78 | | - if( !$status->isGood() ) |
| | 78 | + if( !$status->isGood() ) { |
| | 79 | + $wgOut->addHTML( '<h2>' . $this->prepareMessage( 'filedeleteerror-short' ) . "</h2>\n" ); |
| | 80 | + $wgOut->addHTML( '<span class="error">' ); |
| 79 | 81 | $wgOut->addWikiText( $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) ); |
| | 82 | + $wgOut->addHTML( '</span>' ); |
| | 83 | + } |
| 80 | 84 | if( $status->ok ) { |
| 81 | 85 | $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); |
| 82 | 86 | $wgOut->addHTML( $this->prepareMessage( 'filedelete-success' ) ); |
| — | — | @@ -141,7 +145,7 @@ |
| 142 | 146 | throw $e; |
| 143 | 147 | } |
| 144 | 148 | } |
| 145 | | - if( $status->isGood() ) |
| | 149 | + if( $status->isGood() ) |
| 146 | 150 | wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason)); |
| 147 | 151 | |
| 148 | 152 | return $status; |
| — | — | @@ -193,7 +197,7 @@ |
| 194 | 198 | "</td> |
| 195 | 199 | </tr> |
| 196 | 200 | {$suppress}"; |
| 197 | | - if( $wgUser->isLoggedIn() ) { |
| | 201 | + if( $wgUser->isLoggedIn() ) { |
| 198 | 202 | $form .= " |
| 199 | 203 | <tr> |
| 200 | 204 | <td></td> |