| Index: trunk/phase3/includes/HTMLForm.php |
| — | — | @@ -209,7 +209,9 @@ |
| 210 | 210 | $result = $this->trySubmit(); |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | | - if ( $result === true ) { |
| | 213 | + if ( $result === true || |
| | 214 | + ( $result instanceof Status && $result->isGood() ) ) |
| | 215 | + { |
| 214 | 216 | return $result; |
| 215 | 217 | } |
| 216 | 218 | |
| — | — | @@ -460,7 +462,10 @@ |
| 461 | 463 | * @return String |
| 462 | 464 | */ |
| 463 | 465 | function getErrors( $errors ) { |
| 464 | | - if ( is_array( $errors ) ) { |
| | 466 | + if ( $errors instanceof Status ) { |
| | 467 | + global $wgOut; |
| | 468 | + $errorstr = $wgOut->parse( $errors->getWikiText() ); |
| | 469 | + } elseif ( is_array( $errors ) ) { |
| 465 | 470 | $errorstr = $this->formatErrors( $errors ); |
| 466 | 471 | } else { |
| 467 | 472 | $errorstr = $errors; |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -1328,7 +1328,7 @@ |
| 1329 | 1329 | $wgOut->redirect( $url ); |
| 1330 | 1330 | } |
| 1331 | 1331 | |
| 1332 | | - return true; |
| | 1332 | + return Status::newGood(); |
| 1333 | 1333 | } |
| 1334 | 1334 | |
| 1335 | 1335 | public static function loadOldSearchNs( $user ) { |