diff options
| author | nikrou <nikrou@piwigo.org> | 2009-11-20 14:17:04 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2009-11-20 14:17:04 +0000 |
| commit | 924dd262ec3778277cf1efedee92fa5dd4fb2d32 (patch) | |
| tree | 05176413aa5b4762dd72477099644c732389f971 /upgrade.php | |
| parent | c020cd0d7cb7710a6ffe04fc8b6d6ccfecb2c466 (diff) | |
Feature 1244 resolved
Replace all mysql functions in core code by ones independant of database engine
Fix small php code synxtax : hash must be accessed with [ ] and not { }.
git-svn-id: http://piwigo.org/svn/trunk@4325 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'upgrade.php')
| -rw-r--r-- | upgrade.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/upgrade.php b/upgrade.php index a425ec731..817f8db93 100644 --- a/upgrade.php +++ b/upgrade.php @@ -43,6 +43,7 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php'); include(PHPWG_ROOT_PATH.'include/config_database.inc.php'); include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php'); +include(PHPWG_ROOT_PATH .'include/dblayer/functions_mysql.inc.php'); prepare_conf_upgrade(); @@ -50,13 +51,11 @@ include_once(PHPWG_ROOT_PATH.'include/constants.php'); define('PREFIX_TABLE', $prefixeTable); // Database connection -mysql_connect( $conf['db_host'], $conf['db_user'], $conf['db_password'] ) or die ( "Could not connect to database server" ); -mysql_select_db( $conf['db_base'] ) or die ( "Could not connect to database" ); -if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') - and defined('DB_CHARSET') and DB_CHARSET!='' ) -{ - pwg_query('SET NAMES "'.DB_CHARSET.'"'); -} +$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], + $conf['db_password'], $conf['db_base']) + or my_error('pwg_db_connect', true); + +pwg_db_check_charset(); // +-----------------------------------------------------------------------+ // | functions | @@ -76,7 +75,7 @@ SHOW TABLES ;'; $result = pwg_query($query); - while ($row = mysql_fetch_row($result)) + while ($row = pwg_db_fetch_row($result)) { if (preg_match('/^'.PREFIX_TABLE.'/', $row[0])) { @@ -105,7 +104,7 @@ DESC '.$table.' $columns_of[$table] = array(); - while ($row = mysql_fetch_row($result)) + while ($row = pwg_db_fetch_row($result)) { array_push($columns_of[$table], $row[0]); } |