diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-05 11:17:31 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-05 11:17:31 -0700 |
| commit | f71b6c8ea5dbfcf0f02f97f579151716efc82e79 (patch) | |
| tree | dbe06ec8eca3a0d7a17fa3d55d5734981c344677 | |
| parent | ab0af38629f1f101a420f8f7f245f0afbf37ff76 (diff) | |
| parent | 19074a3420029cfdf363a8afeb98443018a0e767 (diff) | |
| download | forums-f71b6c8ea5dbfcf0f02f97f579151716efc82e79.tar forums-f71b6c8ea5dbfcf0f02f97f579151716efc82e79.tar.gz forums-f71b6c8ea5dbfcf0f02f97f579151716efc82e79.tar.bz2 forums-f71b6c8ea5dbfcf0f02f97f579151716efc82e79.tar.xz forums-f71b6c8ea5dbfcf0f02f97f579151716efc82e79.zip | |
Merge pull request #1695 from dhruvgoel92/ticket/11825
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/schema_data.php (renamed from phpBB/phpbb/db/schema_data.php) | 0 |
3 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(); diff --git a/phpBB/phpbb/db/schema_data.php b/phpBB/includes/db/schema_data.php index 9940a9380f..9940a9380f 100644 --- a/phpBB/phpbb/db/schema_data.php +++ b/phpBB/includes/db/schema_data.php |