diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-07-29 20:24:52 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-29 20:24:52 +0200 |
| commit | 6eb284b23af0568922e787e5875dc1ee8783e71f (patch) | |
| tree | 0a9918aa14c868b71e6a6568e8c5959925336833 /phpBB/phpbb/install/module/install_database | |
| parent | 979e125c7c192016ce4b1ed13a1090a58ab863b0 (diff) | |
| download | forums-6eb284b23af0568922e787e5875dc1ee8783e71f.tar forums-6eb284b23af0568922e787e5875dc1ee8783e71f.tar.gz forums-6eb284b23af0568922e787e5875dc1ee8783e71f.tar.bz2 forums-6eb284b23af0568922e787e5875dc1ee8783e71f.tar.xz forums-6eb284b23af0568922e787e5875dc1ee8783e71f.zip | |
[ticket/14056] Keep install schema resources in the install folder
PHPBB3-14056
Diffstat (limited to 'phpBB/phpbb/install/module/install_database')
| -rw-r--r-- | phpBB/phpbb/install/module/install_database/task/add_default_data.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/install_database/task/create_schema.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/module/install_database/task/add_default_data.php b/phpBB/phpbb/install/module/install_database/task/add_default_data.php index 1e1eb10403..3d73a74618 100644 --- a/phpBB/phpbb/install/module/install_database/task/add_default_data.php +++ b/phpBB/phpbb/install/module/install_database/task/add_default_data.php @@ -87,7 +87,7 @@ class add_default_data extends \phpbb\install\task_base $dbms_info = $this->database_helper->get_available_dbms($dbms); // Get schema data from file - $sql_query = @file_get_contents($this->phpbb_root_path . 'phpbb/install/schemas/schema_data.sql'); + $sql_query = @file_get_contents($this->phpbb_root_path . 'install/schemas/schema_data.sql'); // Clean up SQL $sql_query = $this->replace_dbms_specific_sql($sql_query); diff --git a/phpBB/phpbb/install/module/install_database/task/create_schema.php b/phpBB/phpbb/install/module/install_database/task/create_schema.php index 556bfd5e81..cbec5edb6d 100644 --- a/phpBB/phpbb/install/module/install_database/task/create_schema.php +++ b/phpBB/phpbb/install/module/install_database/task/create_schema.php @@ -144,9 +144,9 @@ class create_schema extends \phpbb\install\task_base $change_prefix = false; // Generate database schema - if ($this->filesystem->exists($this->phpbb_root_path . 'phpbb/install/schemas/schema.json')) + if ($this->filesystem->exists($this->phpbb_root_path . 'install/schemas/schema.json')) { - $db_table_schema = @file_get_contents($this->phpbb_root_path . 'phpbb/install/schemas/schema.json'); + $db_table_schema = @file_get_contents($this->phpbb_root_path . 'install/schemas/schema.json'); $db_table_schema = json_decode($db_table_schema, true); $change_prefix = true; } |