diff options
| author | mistic100 <mistic@piwigo.org> | 2012-10-13 09:05:58 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2012-10-13 09:05:58 +0000 |
| commit | cb118782331ff5450cb2424c96c4e582b3cc672d (patch) | |
| tree | c38ad4078414b3b8bd18a207e57e5a956fa01342 | |
| parent | 97294dac5ac27b43cb6a116d2852578376efa58d (diff) | |
feature 2773: add pwg_db_close() method
git-svn-id: http://piwigo.org/svn/trunk@18634 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/include/functions.php | 2 | ||||
| -rw-r--r-- | i.php | 2 | ||||
| -rw-r--r-- | include/dblayer/functions_mysql.inc.php | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 01d1a4bab..8e310148e 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1676,7 +1676,7 @@ function create_table_add_character_set($query) defined('DB_CHARSET') or fatal_error('create_table_add_character_set DB_CHARSET undefined'); if ('DB_CHARSET'!='') { - if ( version_compare(mysql_get_server_info(), '4.1.0', '<') ) + if ( version_compare(pwg_get_db_version(), '4.1.0', '<') ) { return $query; } @@ -518,7 +518,7 @@ else { $page['rotation_angle'] = 0; } -mysql_close($pwg_db_link); +pwg_db_close($pwg_db_link); if (!try_switch_source($params, $src_mtime) && $params->type==IMG_CUSTOM) { diff --git a/include/dblayer/functions_mysql.inc.php b/include/dblayer/functions_mysql.inc.php index f33d616b0..32b6b1208 100644 --- a/include/dblayer/functions_mysql.inc.php +++ b/include/dblayer/functions_mysql.inc.php @@ -178,6 +178,11 @@ function pwg_db_insert_id($table=null, $column='id') return mysql_insert_id(); } +function pwg_db_close($link=null) +{ + return mysql_close($link); +} + /** * * complex functions |