| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -112,13 +112,12 @@ |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | public function startStage( $step ) { |
| 116 | | - $this->showMessage( wfMsg( "config-install-$step" ) . |
| 117 | | - wfMsg( 'ellipsis' ) . wfMsg( 'word-separator' ) ); |
| | 116 | + $this->showMessage( "config-install-$step" ); |
| 118 | 117 | } |
| 119 | 118 | |
| 120 | 119 | public function endStage( $step, $status ) { |
| 121 | 120 | $this->showStatusMessage( $status ); |
| 122 | | - $this->showMessage( wfMsg( 'config-install-step-done' ) . "\n" ); |
| | 121 | + $this->showMessage( 'config-install-step-done' ); |
| 123 | 122 | } |
| 124 | 123 | |
| 125 | 124 | public function showMessage( $msg /*, ... */ ) { |
| — | — | @@ -126,10 +125,6 @@ |
| 127 | 126 | array_shift( $params ); |
| 128 | 127 | |
| 129 | 128 | $text = wfMsgExt( $msg, array( 'parseinline' ), $params ); |
| 130 | | - /* parseinline has the nasty side-effect of putting encoded |
| 131 | | - * angle brackets, around the message. |
| 132 | | - */ |
| 133 | | - $text = preg_replace( '/(^<|>$)/', '', $text ); |
| 134 | 129 | |
| 135 | 130 | $text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 <$1>', $text ); |
| 136 | 131 | echo html_entity_decode( strip_tags( $text ), ENT_QUOTES ) . "\n"; |
| — | — | @@ -141,9 +136,8 @@ |
| 142 | 137 | $status->getErrorsArray() ); |
| 143 | 138 | |
| 144 | 139 | if ( count( $warnings ) !== 0 ) { |
| 145 | | - foreach ( $status->getWikiTextArray( $warnings ) as $w ) { |
| 146 | | - $this->showMessage( $w . wfMsg( 'ellipsis' ) . |
| 147 | | - wfMsg( 'word-separator' ) ); |
| | 140 | + foreach ( $warnings as $w ) { |
| | 141 | + call_user_func_array( array( $this, 'showMessage' ), $w ); |
| 148 | 142 | } |
| 149 | 143 | } |
| 150 | 144 | |