From b1b4c5a5e38a646fae05cc0e6e34410c0d85ad4c Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sun, 16 Dec 2001 01:52:52 +0000 Subject: Should be a fix for another global_var issue bug #492118 also modded install template to use .css git-svn-id: file:///svn/phpbb/trunk@1600 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install.php | 4 +- phpBB/templates/subSilver/install.tpl | 98 +++++------------------------------ 2 files changed, 16 insertions(+), 86 deletions(-) diff --git a/phpBB/install.php b/phpBB/install.php index 63f595e72b..0b98275205 100644 --- a/phpBB/install.php +++ b/phpBB/install.php @@ -219,7 +219,7 @@ $dbname = ( !empty($HTTP_POST_VARS['dbname']) ) ? $HTTP_POST_VARS['dbname'] : "" $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ) ? $HTTP_POST_VARS['prefix'] : ""; -$admin_username = ( !empty($HTTP_POST_VARS['admin_user']) ) ? $HTTP_POST_VARS['admin_user'] : ""; +$admin_name = ( !empty($HTTP_POST_VARS['admin_name']) ) ? $HTTP_POST_VARS['admin_name'] : ""; $admin_pass1 = ( !empty($HTTP_POST_VARS['admin_pass1']) ) ? $HTTP_POST_VARS['admin_pass1'] : ""; $admin_pass2 = ( !empty($HTTP_POST_VARS['admin_pass2']) ) ? $HTTP_POST_VARS['admin_pass2'] : ""; @@ -556,7 +556,7 @@ else if( ( empty($install_step) || $admin_pass1 != $admin_pass2 || $dbhost == "" "DB_HOST" => ( $dbhost != "" ) ? $dbhost : "", "DB_USER" => ( $dbuser != "" ) ? $dbuser : "", "DB_PASSWD" => ( $dbpasswd != "" ) ? $dbpasswd : "", - "ADMIN_USERNAME" => ( $admin_username != "" ) ? $admin_username : "", + "ADMIN_USERNAME" => ( $admin_name != "" ) ? $admin_name : "", "S_LANG_SELECT" => $lang_options, "S_DBMS_SELECT" => $dbms_options, diff --git a/phpBB/templates/subSilver/install.tpl b/phpBB/templates/subSilver/install.tpl index d8c0a605d1..3dea5d9efa 100644 --- a/phpBB/templates/subSilver/install.tpl +++ b/phpBB/templates/subSilver/install.tpl @@ -1,94 +1,28 @@ - - - - - + + {L_INSTALLATION} + - @@ -133,10 +67,6 @@ a.copyright:hover { color: #000000; text-decoration: underline;} - -- cgit v1.2.1
{L_UPGRADE}: {S_UPGRADE_SELECT}
{L_DATABASE_CONFIGURATION}