diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-10 16:19:39 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-09-10 16:19:39 -0400 |
| commit | 18f6a161017f5350d9487181f4b4ed66a53a0284 (patch) | |
| tree | 5d43d1847832169510c55c3358c42ccd095b2128 /phpBB/develop | |
| parent | 3f81057f96ae87d2a881f5c71be1816c703cb1fd (diff) | |
| parent | 71aeec40f6c4c5e6a69699486b618c2ba67dff2d (diff) | |
| download | forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar.gz forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar.bz2 forums-18f6a161017f5350d9487181f4b4ed66a53a0284.tar.xz forums-18f6a161017f5350d9487181f4b4ed66a53a0284.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 3aacd31e70..9ffc8d229f 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -20,7 +20,7 @@ if (!is_writable($schema_path)) define('IN_PHPBB', true); -require(dirname(__FILE__) . '/../phpbb/db/schema_data.php'); +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(); diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 340112fa38..3decee306a 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -56,7 +56,7 @@ echo "USE $dbname;$newline$newline"; @set_time_limit(0); -require($phpbb_root_path . 'phpbb/db/schema_data.' . $phpEx); +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(); |