| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -731,11 +731,18 @@ |
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | /** |
| 735 | | - * Output an error box using a Status object |
| | 735 | + * Output an error or warning box using a Status object |
| 736 | 736 | */ |
| 737 | | - function showStatusErrorBox( $status ) { |
| 738 | | - $text = $status->getWikiText(); |
| 739 | | - $this->output->addHTML( $this->getErrorBox( $text ) ); |
| | 737 | + function showStatusBox( $status ) { |
| | 738 | + if( !$status->isGood() ) { |
| | 739 | + $text = $status->getWikiText(); |
| | 740 | + if( $status->isOk() ) { |
| | 741 | + $box = $this->getWarningBox( $text ); |
| | 742 | + } else { |
| | 743 | + $box = $this->getErrorBox( $text ); |
| | 744 | + } |
| | 745 | + $this->output->addHTML( $box ); |
| | 746 | + } |
| 740 | 747 | } |
| 741 | 748 | |
| 742 | 749 | function showStatusMessage( $status ) { |
| — | — | @@ -985,7 +992,7 @@ |
| 986 | 993 | $this->setVar( '_UpgradeDone', false ); |
| 987 | 994 | return 'continue'; |
| 988 | 995 | } else { |
| 989 | | - $this->parent->showStatusErrorBox( $status ); |
| | 996 | + $this->parent->showStatusBox( $status ); |
| 990 | 997 | } |
| 991 | 998 | } |
| 992 | 999 | |
| — | — | @@ -1112,7 +1119,7 @@ |
| 1113 | 1120 | } elseif ( $status->isGood() ) { |
| 1114 | 1121 | return 'continue'; |
| 1115 | 1122 | } else { |
| 1116 | | - $this->parent->showStatusErrorBox( $status ); |
| | 1123 | + $this->parent->showStatusBox( $status ); |
| 1117 | 1124 | } |
| 1118 | 1125 | } |
| 1119 | 1126 | |
| — | — | @@ -1588,7 +1595,7 @@ |
| 1589 | 1596 | |
| 1590 | 1597 | $ok = $status->isGood(); |
| 1591 | 1598 | if ( !$ok ) { |
| 1592 | | - $this->parent->showStatusErrorBox( $status ); |
| | 1599 | + $this->parent->showStatusBox( $status ); |
| 1593 | 1600 | } |
| 1594 | 1601 | $this->endStage( $ok ); |
| 1595 | 1602 | } |