mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11015] Move db driver class name fixing to function

Browse Source 
PHPBB3-11015
This commit is contained in:
Igor Wiedler
2012-11-17 00:24:32 +01:00
parent 8f8a7f7637
commit 5bc0f4b3d4
7 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/di/extension/config.php
View File

@@ -44,7 +44,7 @@ class phpbb_di_extension_config extends Extension
$container->setParameter('core.table_prefix', $table_prefix);
$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
$container->setParameter('dbal.driver.class', $this->convert_30_dbms($dbms));
$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));
$container->setParameter('dbal.dbhost', $dbhost);
$container->setParameter('dbal.dbuser', $dbuser);
$container->setParameter('dbal.dbpasswd', $dbpasswd);
@@ -80,20 +80,4 @@ class phpbb_di_extension_config extends Extension
return $acm_type;
}
/**
* Convert 3.0 dbms to 3.1 db driver class name
*
* @param string $dbms dbms parameter
* @return db driver class
*/
protected function convert_30_dbms($dbms)
{
if (!preg_match('#^phpbb_db_driver_#', $dbms))
{
return 'phpbb_db_driver_'.$dbms;
}
return $dbms;
}
}

16
phpBB/includes/functions.php
View File

@@ -5412,3 +5412,19 @@ function phpbb_to_numeric($input)
{
return ($input > PHP_INT_MAX) ? (float) $input : (int) $input;
}
/**
* Convert 3.0 dbms to 3.1 db driver class name
*
* @param string $dbms dbms parameter
* @return db driver class
*/
function phpbb_convert_30_dbms_to_31($dbms)
{
if (!preg_match('#^phpbb_db_driver_#', $dbms))
{
return 'phpbb_db_driver_'.$dbms;
}
return $dbms;
}

2
phpBB/includes/questionnaire/questionnaire.php
View File

@@ -260,6 +260,8 @@ class phpbb_questionnaire_phpbb_data_provider
include("{$phpbb_root_path}config.$phpEx");
unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution
$dbms = phpbb_convert_30_dbms_to_31($dbms);
// Only send certain config vars
$config_vars = array(
'active_sessions' => true,

2
phpBB/install/convertors/convert_phpbb20.php
View File

@@ -24,6 +24,8 @@ if (!defined('IN_PHPBB'))
include($phpbb_root_path . 'config.' . $phpEx);
unset($dbpasswd);
$dbms = phpbb_convert_30_dbms_to_31($dbms);
/**
* $convertor_data provides some basic information about this convertor which is
* used on the initial list of convertors and to populate the default settings

8
phpBB/install/install_convert.php
View File

@@ -123,6 +123,8 @@ class install_convert extends module
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
$dbms = phpbb_convert_30_dbms_to_31($dbms);
$db = new $dbms();
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
unset($dbpasswd);
@@ -210,6 +212,8 @@ class install_convert extends module
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
$dbms = phpbb_convert_30_dbms_to_31($dbms);
$db = new $dbms();
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
unset($dbpasswd);
@@ -332,6 +336,8 @@ class install_convert extends module
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
$dbms = phpbb_convert_30_dbms_to_31($dbms);
$db = new $dbms();
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
unset($dbpasswd);
@@ -573,6 +579,8 @@ class install_convert extends module
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
$dbms = phpbb_convert_30_dbms_to_31($dbms);
$db = new $dbms();
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true);
unset($dbpasswd);

2
phpBB/install/install_update.php
View File

@@ -91,6 +91,8 @@ class install_update extends module
define('MERGE_NEW_FILE', 3);
define('MERGE_MOD_FILE', 4);
$dbms = phpbb_convert_30_dbms_to_31($dbms);
$db = new $dbms();
// Connect to DB