# HG changeset patch # User Dan # Date 1200671244 18000 # Node ID 979d99a0b00e3bdce8c14059962dbaac2e3fa696 # Parent 2398420f48e7a186eda84fa546ac7b91cabccb1c A few more installer tweaks / fixes. Initted upgrade script. Added migration schema from 1.0 to 1.1. diff -r 2398420f48e7 -r 979d99a0b00e includes/common.php --- a/includes/common.php Thu Jan 17 23:31:35 2008 -0500 +++ b/includes/common.php Fri Jan 18 10:47:24 2008 -0500 @@ -205,7 +205,7 @@ // Now that we have the config, check the Enano version. if ( enano_version(false, true) != $version && !defined('IN_ENANO_UPGRADE') ) { - grinding_halt('Version mismatch', '
It seems that the Enano release we\'re trying to run ('.$version.') is different from the version specified in your database ('.enano_version().'). Perhaps you need to upgrade?
'); + grinding_halt('Version mismatch', 'It seems that the Enano release we\'re trying to run ('.$version.') is different from the version specified in your database ('.enano_version().'). Perhaps you need to upgrade?
'); } // @@ -239,7 +239,7 @@ } // Is there no default language? -if ( getConfig('lang_default') === false ) +if ( getConfig('lang_default') === false && !defined('IN_ENANO_MIGRATION') ) { $q = $db->sql_query('SELECT lang_id FROM '.table_prefix.'language LIMIT 1;'); if ( !$q ) diff -r 2398420f48e7 -r 979d99a0b00e includes/http.php --- a/includes/http.php Thu Jan 17 23:31:35 2008 -0500 +++ b/includes/http.php Fri Jan 18 10:47:24 2008 -0500 @@ -353,8 +353,8 @@ echo "Cookies: $cookies
"; echo "GET URI: " . htmlspecialchars($this->uri . $get) . "
"; echo "POST DATA: " . htmlspecialchars($post) . "
"; + echo ""; } - echo ""; $this->_fputs($connection, "{$this->method} {$this->uri}{$get} HTTP/1.1{$newline}"); $this->_fputs($connection, "Host: {$this->host}{$newline}"); diff -r 2398420f48e7 -r 979d99a0b00e install/images/css/installer.css --- a/install/images/css/installer.css Thu Jan 17 23:31:35 2008 -0500 +++ b/install/images/css/installer.css Fri Jan 18 10:47:24 2008 -0500 @@ -92,7 +92,7 @@ padding: 10px; background-image: url(../substages.png); background-repeat: repeat-x; - width: 70%; + width: 77%; margin: 20px auto 0 auto; text-align: center; color: #808080; diff -r 2398420f48e7 -r 979d99a0b00e install/includes/common.php --- a/install/includes/common.php Thu Jan 17 23:31:35 2008 -0500 +++ b/install/includes/common.php Fri Jan 18 10:47:24 2008 -0500 @@ -21,6 +21,23 @@ // If type is set to "rc", "beta", or "alpha", optionally another version number can be issued with the key 'sub': // 'sub' => '3' will produce Enano 1.1.1a3 / Enano 1.1.1 alpha 3 ); + +function installer_enano_version($long = false) +{ + global $installer_version; + static $keywords = array( + 'alpha' => 'a', + 'beta' => 'b', + 'RC' => 'rc' + ); + $v = $installer_version['version']; + if ( isset($installer_version['sub']) ) + { + $v .= ( $short ) ? $keywords[$installer_version['type']] : " {$installer_version['type']} "; + $v .= $installer_version['sub']; + } + return $v; +} // Determine Enano root directory diff -r 2398420f48e7 -r 979d99a0b00e install/includes/ui.php --- a/install/includes/ui.php Thu Jan 17 23:31:35 2008 -0500 +++ b/install/includes/ui.php Fri Jan 18 10:47:24 2008 -0500 @@ -215,7 +215,7 @@ echo "