| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1501,6 +1501,7 @@ |
| 1502 | 1502 | return 'continue'; |
| 1503 | 1503 | } |
| 1504 | 1504 | $this->startForm(); |
| | 1505 | + $this->parent->exportVars(); |
| 1505 | 1506 | $this->parent->output->addHTML("<ul>"); |
| 1506 | 1507 | foreach( $this->parent->getInstallSteps() as $step ) { |
| 1507 | 1508 | $this->startStage( "config-install-$step" ); |
| — | — | @@ -1521,7 +1522,7 @@ |
| 1522 | 1523 | $msg = $success ? 'config-install-step-done' : 'config-install-step-failed'; |
| 1523 | 1524 | $html = wfMsgHtml( $msg ); |
| 1524 | 1525 | if ( !$success ) { |
| 1525 | | - $html = "<span class=\"error\">$html</html>"; |
| | 1526 | + $html = "<span class=\"error\">$html</span>"; |
| 1526 | 1527 | } |
| 1527 | 1528 | $this->parent->output->addHTML( $html . "</li>\n" ); |
| 1528 | 1529 | } |
| Index: branches/new-installer/phase3/includes/installer/Installer.php |
| — | — | @@ -129,7 +129,7 @@ |
| 130 | 130 | 'database', |
| 131 | 131 | 'tables', |
| 132 | 132 | 'secretkey', |
| 133 | | - // 'sysop', |
| | 133 | + 'sysop', |
| 134 | 134 | 'localsettings', |
| 135 | 135 | ); |
| 136 | 136 | |
| — | — | @@ -309,6 +309,17 @@ |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /** |
| | 313 | + * Exports all wg* variables stored by the installer into global scope |
| | 314 | + */ |
| | 315 | + function exportVars() { |
| | 316 | + foreach ( $this->settings as $name => $value ) { |
| | 317 | + if ( substr( $name, 0, 2 ) == 'wg' ) { |
| | 318 | + $GLOBALS[$name] = $value; |
| | 319 | + } |
| | 320 | + } |
| | 321 | + } |
| | 322 | + |
| | 323 | + /** |
| 313 | 324 | * Get a fake password for sending back to the user in HTML. |
| 314 | 325 | * This is a security mechanism to avoid compromise of the password in the |
| 315 | 326 | * event of session ID compromise. |