aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.inc.php
diff options
context:
space:
mode:
authorgweltas <gweltas@piwigo.org>2004-02-20 19:07:43 +0000
committergweltas <gweltas@piwigo.org>2004-02-20 19:07:43 +0000
commit3bf770a16a15400eb2bde63782e07ba55dde2ed4 (patch)
tree4821622bfff136c6f7fb98e89ba1ba9f7b3a56e6 /include/common.inc.php
parentc6a91a26c4f9e5a3294a708988d6f6234a3f4a38 (diff)
Migration of installation procedure
git-svn-id: http://piwigo.org/svn/trunk@367 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/common.inc.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 844c8f433..577917e0d 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -112,7 +112,7 @@ $user = array();
$lang = array();
-include(PHPWG_ROOT_PATH .'config.php');
+include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
if( !defined("PHPWG_INSTALLED") )
{
header( 'Location: install.php' );
@@ -121,18 +121,18 @@ if( !defined("PHPWG_INSTALLED") )
include(PHPWG_ROOT_PATH . 'include/constants.php');
+include(PHPWG_ROOT_PATH . 'include/config.inc.php');
include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
include(PHPWG_ROOT_PATH . 'include/template.php');
include(PHPWG_ROOT_PATH . 'include/vtemplate.class.php');
-include(PHPWG_ROOT_PATH . 'include/config.inc.php');
//
// Database connection
//
-mysql_connect( $cfgHote, $cfgUser, $cfgPassword )
+mysql_connect( $dbhost, $dbuser, $dbpasswd )
or die ( "Could not connect to server" );
-mysql_select_db( $cfgBase )
+mysql_select_db( $dbname )
or die ( "Could not connect to database" );
//
@@ -210,3 +210,4 @@ if ( $user['is_the_guest'] ) $user['username'] = $lang['guest'];
include_once( './template/'.$user['template'].'/htmlfunctions.inc.php' );
define('PREFIX_TABLE', $table_prefix);
?>
+