diff -r de56132c008d -r bdac73ed481e install/includes/stages/install.php --- a/install/includes/stages/install.php Sun Mar 28 21:49:26 2010 -0400 +++ b/install/includes/stages/install.php Sun Mar 28 23:10:46 2010 -0400 @@ -14,7 +14,7 @@ */ if ( !defined('IN_ENANO_INSTALL') ) - die(); + die(); require ( ENANO_ROOT . '/install/includes/libenanoinstall.php' ); require ( ENANO_ROOT . '/includes/sql_parse.php' ); @@ -23,36 +23,36 @@ if ( !in_array($dbdriver, $supported_drivers) ) { - $ui->show_header(); - echo '

Installation error

-

ERROR: That database driver is not supported.

'; - return true; + $ui->show_header(); + echo '

Installation error

+

ERROR: That database driver is not supported.

'; + return true; } $db = new $dbdriver(); $result = $db->connect(); if ( !$result ) { - $ui->show_header(); - // FIXME: l10n - ?> -
- - -

get('database_msg_post_fail_title'); ?>

-

get('database_msg_post_fail_body'); ?>

-

get('database_msg_post_fail_desc'); ?> - sql_error(); - ?> -

-

- - -

-
- show_header(); + // FIXME: l10n + ?> +
+ + +

get('database_msg_post_fail_title'); ?>

+

get('database_msg_post_fail_body'); ?>

+

get('database_msg_post_fail_desc'); ?> + sql_error(); + ?> +

+

+ + +

+
+ get('install_stg_startapi_title'), 'stg_sim_good', '...', false); + run_installer_stage('startapi', $lang->get('install_stg_startapi_title'), 'stg_sim_good', '...', false); } else { - run_installer_stage('startapi', $lang->get('install_stg_startapi_title'), 'stg_sim_bad', $lang->get('install_stg_startapi_body'), false); + run_installer_stage('startapi', $lang->get('install_stg_startapi_title'), 'stg_sim_bad', $lang->get('install_stg_startapi_body'), false); } // Import languages @@ -117,10 +117,10 @@ ?>
- -
- -
+ +
+ +