aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2010-04-10 19:49:30 +0000
committernikrou <nikrou@piwigo.org>2010-04-10 19:49:30 +0000
commit8ed51d84970bd1ce44a093d0ae5801a7c656b821 (patch)
tree6d80e4dcf9c8a44503b735a205228db7548c84e0
parent3d20e56ada54a50b2c85dff71c5ee8f6e9a81a46 (diff)
Fix some issues with database connections.
install_db_connect() function must return database resource link insert into set syntax is mysql specific git-svn-id: http://piwigo.org/svn/trunk@5781 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions_install.inc.php2
-rw-r--r--include/functions.inc.php6
-rw-r--r--install.php2
3 files changed, 5 insertions, 5 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php
index fdfeb08d7..ba8674396 100644
--- a/admin/include/functions_install.inc.php
+++ b/admin/include/functions_install.inc.php
@@ -146,7 +146,7 @@ function install_db_connect(&$infos, &$errors)
$pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'],
$_POST['dbpasswd'], $_POST['dbname']);
- return true;
+ return $pwg_db_link;
}
catch (Exception $e)
{
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 7519c3239..50348f029 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1012,15 +1012,15 @@ function conf_update_param($param, $value)
$query = '
DELETE
FROM '.CONFIG_TABLE.'
- WHERE param = "'.$param.'"
+ WHERE param = \''.$param.'\'
;';
pwg_query($query);
$query = '
INSERT
INTO '.CONFIG_TABLE.'
- SET param = "'.$param.'"
- , value = "'.$value.'"
+ (param, value)
+ VALUES(\''.$param.'\', \''.$value.'\')
;';
pwg_query($query);
}
diff --git a/install.php b/install.php
index 7ddd080b7..f56c32236 100644
--- a/install.php
+++ b/install.php
@@ -262,7 +262,7 @@ include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
if ( isset( $_POST['install'] ))
{
- if (install_db_connect($infos, $errors))
+ if ($pwg_db_link = install_db_connect($infos, $errors))
{
$required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
if ( version_compare(pwg_get_db_version(), $required_version, '>=') )