From ad1e47309409a472a0952e25a95e75bad7da6ab4 Mon Sep 17 00:00:00 2001 From: koichirok Date: Thu, 17 May 2012 11:04:02 +0000 Subject: [PATCH] 2012-05-17 Kikuchi Koichiro * extensions/update_manager/settings.php, extensions/update_manager/main.php: Merged from 4.0.2: Added missing dbport parameter to um_db_connect() call. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6311 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/extensions/update_manager/main.php | 2 +- pandora_console/extensions/update_manager/settings.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 92fed90e15..f568504bc4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-05-17 Kikuchi Koichiro + + * extensions/update_manager/settings.php, + extensions/update_manager/main.php: Merged from 4.0.2: Added missing + dbport parameter to um_db_connect() call. + 2012-05-16 Sergio Martin * include/constants.php: Added a constants for diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php index ba13795f0c..ecb329156a 100644 --- a/pandora_console/extensions/update_manager/main.php +++ b/pandora_console/extensions/update_manager/main.php @@ -30,7 +30,7 @@ function main_view() { } um_db_connect ('mysql', $config['dbhost'], $config['dbuser'], - $config['dbpass'], $config['dbname']); + $config['dbpass'], $config['dbname'], $config['dbport']); $settings = um_db_load_settings (); $user_key = get_user_key ($settings); diff --git a/pandora_console/extensions/update_manager/settings.php b/pandora_console/extensions/update_manager/settings.php index a9853d3290..6c3098f4cf 100644 --- a/pandora_console/extensions/update_manager/settings.php +++ b/pandora_console/extensions/update_manager/settings.php @@ -25,7 +25,7 @@ if (! check_acl ($config['id_user'], 0, 'PM')) { include_once ("extensions/update_manager/lib/functions.php"); um_db_connect ('mysql', $config['dbhost'], $config['dbuser'], - $config['dbpass'], $config['dbname']); + $config['dbpass'], $config['dbname'], $config['dbport']); $update_settings = (bool) get_parameter_post ('update_settings');