| Index: branches/REL1_18/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -709,7 +709,7 @@ |
| 710 | 710 | protected function getDefaultSchemaVars() { |
| 711 | 711 | $vars = parent::getDefaultSchemaVars(); |
| 712 | 712 | $vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', $GLOBALS['wgDBTableOptions'] ); |
| 713 | | - $vars['wgDBTableOptions'] = str_replace( 'CHARSET=mysql4', 'CHARSET=binary', $GLOBALS['wgDBTableOptions'] ); |
| | 713 | + $vars['wgDBTableOptions'] = str_replace( 'CHARSET=mysql4', 'CHARSET=binary', $vars['wgDBTableOptions'] ); |
| 714 | 714 | return $vars; |
| 715 | 715 | } |
| 716 | 716 | |
| Index: branches/REL1_18/phase3/includes/installer/Installer.php |
| — | — | @@ -842,8 +842,13 @@ |
| 843 | 843 | /** |
| 844 | 844 | * Environment check for the server hostname. |
| 845 | 845 | */ |
| 846 | | - protected function envCheckServer() { |
| 847 | | - $server = WebRequest::detectServer(); |
| | 846 | + protected function envCheckServer( $srv = null ) { |
| | 847 | + if ( $srv ) { |
| | 848 | + // wgServer was pre-defined, perhaps by the cli installer |
| | 849 | + $server = $srv; |
| | 850 | + } else { |
| | 851 | + $server = WebRequest::detectServer(); |
| | 852 | + } |
| 848 | 853 | $this->showMessage( 'config-using-server', $server ); |
| 849 | 854 | $this->setVar( 'wgServer', $server ); |
| 850 | 855 | } |
| Index: branches/REL1_18/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -31,6 +31,7 @@ |
| 32 | 32 | 'dbpass' => 'wgDBpassword', |
| 33 | 33 | 'dbschema' => 'wgDBmwschema', |
| 34 | 34 | 'dbpath' => 'wgSQLiteDataDir', |
| | 35 | + 'server' => 'wgServer', |
| 35 | 36 | 'scriptpath' => 'wgScriptPath', |
| 36 | 37 | ); |
| 37 | 38 | |
| — | — | @@ -183,6 +184,13 @@ |
| 184 | 185 | return parent::envCheckPath(); |
| 185 | 186 | } |
| 186 | 187 | |
| | 188 | + protected function envCheckServer( $srv = null ) { |
| | 189 | + if ( $this->getVar( 'wgServer' ) ) { |
| | 190 | + $srv = $this->getVar( 'wgServer' ); |
| | 191 | + } |
| | 192 | + return parent::envCheckServer( $srv ); |
| | 193 | + } |
| | 194 | + |
| 187 | 195 | public function dirIsExecutable( $dir, $url ) { |
| 188 | 196 | $this->showMessage( 'config-no-cli-uploads-check', $dir ); |
| 189 | 197 | return false; |
| Property changes on: branches/REL1_18/phase3/includes/installer/CliInstaller.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 190 | 198 | Merged /trunk/phase3/includes/installer/CliInstaller.php:r102137,104576,104671,105010 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 191 | 199 | Merged /trunk/phase3/includes:r102137,104576,104671,105010 |
| Index: branches/REL1_18/phase3/resources/jquery/jquery.collapsibleTabs.js |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | // if we haven't already bound our resize hanlder, bind it now |
| 26 | 26 | if( !$.collapsibleTabs.boundEvent ) { |
| 27 | 27 | $( window ) |
| 28 | | - .delayedBind( '500', 'resize', function( ) { $.collapsibleTabs.handleResize(); } ); |
| | 28 | + .delayedBind( '500', 'resize', null, function( ) { $.collapsibleTabs.handleResize(); } ); |
| 29 | 29 | } |
| 30 | 30 | // call our resize handler to setup the page |
| 31 | 31 | $.collapsibleTabs.handleResize(); |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 32 | 32 | Merged /trunk/phase3:r102137,104576,104671,105010 |