diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/develop/compile_template.php | 24 | ||||
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 2 | ||||
| -rw-r--r-- | phpBB/docs/auth_api.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_container.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 2 |
7 files changed, 9 insertions, 33 deletions
diff --git a/phpBB/develop/compile_template.php b/phpBB/develop/compile_template.php deleted file mode 100644 index 32d1d321f1..0000000000 --- a/phpBB/develop/compile_template.php +++ /dev/null @@ -1,24 +0,0 @@ -<?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : compile_template.php -// STARTED : Sun Apr 24, 2011 -// COPYRIGHT : © 2011 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - -define('IN_PHPBB', 1); -define('ANONYMOUS', 1); -$phpEx = substr(strrchr(__FILE__, '.'), 1); -$phpbb_root_path = './../'; - -include($phpbb_root_path . 'includes/template_compile.'.$phpEx); - -$file = $argv[1]; - -$compile = new phpbb_template_compile(false); -echo $compile->compile_file($file); 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/docs/auth_api.html b/phpBB/docs/auth_api.html index f45ea5e5c8..c68ae7821f 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -86,7 +86,7 @@ <p>To use any methods contained with the <code>auth</code> class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:</p> <div class="codebox"><pre> -$auth = new phpbb_auth(); +$auth = new phpbb\auth\auth(); </pre></div> <p>Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the <code>auth_admin</code> methods you will need to instantiate this separately but in the same way.</p> diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 91a80a897d..b3e50847fd 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5701,7 +5701,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/includes/functions_container.php b/phpBB/includes/functions_container.php index 62559fbf36..667d27fd20 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -152,12 +152,12 @@ function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path) return phpbb_create_compiled_container( $config_file, array( - new phpbb_di_extension_config($config_file), - new phpbb_di_extension_core($config_path), + new phpbb\di\extension\config($config_file), + new phpbb\di\extension\core($config_path), ), array( - new phpbb_di_pass_collection_pass(), - new phpbb_di_pass_kernel_pass(), + new phpbb\di\pass\collection_pass(), + new phpbb\di\pass\kernel_pass(), ), $phpbb_root_path, $php_ext 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) . '%'; |