diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-09-26 00:42:04 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-09-26 00:42:04 +0200 |
| commit | 03639c081cfe92dea223b6c2125e94319ae001ce (patch) | |
| tree | dc0c0c291054a102e62a00ee7e95134a63266267 | |
| parent | 8da31332381b572f8d03c63d4c32a4f32ed8775f (diff) | |
| download | forums-03639c081cfe92dea223b6c2125e94319ae001ce.tar forums-03639c081cfe92dea223b6c2125e94319ae001ce.tar.gz forums-03639c081cfe92dea223b6c2125e94319ae001ce.tar.bz2 forums-03639c081cfe92dea223b6c2125e94319ae001ce.tar.xz forums-03639c081cfe92dea223b6c2125e94319ae001ce.zip | |
[ticket/11866] Update some occurances of phpbb_db_ to new Namespace
PHPBB3-11866
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 2 | ||||
| -rw-r--r-- | tests/RUNNING_TESTS.md | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 9ffc8d229f..5ef278d493 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); require(dirname(__FILE__) . '/../includes/db/schema_data.php'); require(dirname(__FILE__) . '/../phpbb/db/tools.php'); -$dbms_type_map = phpbb_db_tools::get_dbms_type_map(); +$dbms_type_map = phpbb\db\tools::get_dbms_type_map(); // A list of types being unsigned for better reference in some db's $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 3decee306a..eb34034826 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -59,7 +59,7 @@ echo "USE $dbname;$newline$newline"; require($phpbb_root_path . 'includes/db/schema_data.' . $phpEx); require($phpbb_root_path . 'phpbb/db/tools.' . $phpEx); -$dbms_type_map = phpbb_db_tools::get_dbms_type_map(); +$dbms_type_map = phpbb\db\tools::get_dbms_type_map(); foreach ($schema_data as $table_name => $table_data) { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e905375f4a..acf4800849 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5671,7 +5671,7 @@ function phpbb_to_numeric($input) * Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name. * * If $dbms is a valid 3.1 db driver class name, returns it unchanged. -* Otherwise prepends phpbb_db_driver_ to the dbms to convert a 3.0 dbms +* Otherwise prepends phpbb\db\driver\ to the dbms to convert a 3.0 dbms * to 3.1 db driver class name. * * @param string $dbms dbms parameter diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index cd960bc65a..53d39e9127 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -84,7 +84,7 @@ class driver // Fill default sql layer based on the class being called. // This can be changed by the specified layer itself later if needed. - $this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_')); + $this->sql_layer = substr(get_class($this), strlen('phpbb\db\driver\\')); // Do not change this please! This variable is used to easy the use of it - and is hardcoded. $this->any_char = chr(0) . '%'; diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index f2688ab675..aa988231e7 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -57,7 +57,7 @@ found below. More information on configuration options can be found on the wiki (see below). <?php - $dbms = 'phpbb_db_driver_mysqli'; + $dbms = 'phpbb\\db\\driver\\mysqli'; $dbhost = 'localhost'; $dbport = ''; $dbname = 'database'; |