aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-12-06 16:34:02 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-06 17:10:07 +0100
commitec90f2b380a598a3dbf7ada0e95878d9d1b85cbe (patch)
treef2cbf3419cbf1c0fea7391f03dfb418cc5c9dc72 /phpBB/develop
parentd78bb2865b27aa753b165fdc8aaa73ed82eaeac8 (diff)
downloadforums-ec90f2b380a598a3dbf7ada0e95878d9d1b85cbe.tar
forums-ec90f2b380a598a3dbf7ada0e95878d9d1b85cbe.tar.gz
forums-ec90f2b380a598a3dbf7ada0e95878d9d1b85cbe.tar.bz2
forums-ec90f2b380a598a3dbf7ada0e95878d9d1b85cbe.tar.xz
forums-ec90f2b380a598a3dbf7ada0e95878d9d1b85cbe.zip
[ticket/13421] Move tools to subdirectory
PHPBB3-13421
Diffstat (limited to 'phpBB/develop')
-rw-r--r--phpBB/develop/create_schema_files.php4
-rw-r--r--phpBB/develop/mysql_upgrader.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 7ef86ad7fc..e4102a02e7 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -49,9 +49,9 @@ $classes = $finder->core_path('phpbb/')
->get_classes();
$db = new \phpbb\db\driver\sqlite();
-$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
+$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_data = $schema_generator->get_schema();
-$dbms_type_map = phpbb\db\tools::get_dbms_type_map();
+$dbms_type_map = phpbb\db\tools\tools::get_dbms_type_map();
$fp = fopen($schema_path . 'schema.json', 'wb');
fwrite($fp, json_encode($schema_data, JSON_PRETTY_PRINT));
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 5c558f0b8e..ff4e38fb0a 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -63,9 +63,9 @@ echo "USE $dbname;$newline$newline";
@set_time_limit(0);
require($phpbb_root_path . 'includes/db/schema_data.' . $phpEx);
-require($phpbb_root_path . 'phpbb/db/tools.' . $phpEx);
+require($phpbb_root_path . 'phpbb/db/tools/tools.' . $phpEx);
-$dbms_type_map = phpbb\db\tools::get_dbms_type_map();
+$dbms_type_map = phpbb\db\tools\tools::get_dbms_type_map();
foreach ($schema_data as $table_name => $table_data)
{