diff options
| author | CHItA <mate.bartus@gmail.com> | 2015-06-18 02:12:49 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-08 01:28:06 +0200 |
| commit | 0f5f62f8db4fe5816329abaca7ad6ff10c8cf749 (patch) | |
| tree | 7fd7e2ba6fd0f4687813eb4dc8aa36db402ab557 | |
| parent | 69a19e48fab4cfd6243bf7ac7e0c7373651b6f41 (diff) | |
| download | forums-0f5f62f8db4fe5816329abaca7ad6ff10c8cf749.tar forums-0f5f62f8db4fe5816329abaca7ad6ff10c8cf749.tar.gz forums-0f5f62f8db4fe5816329abaca7ad6ff10c8cf749.tar.bz2 forums-0f5f62f8db4fe5816329abaca7ad6ff10c8cf749.tar.xz forums-0f5f62f8db4fe5816329abaca7ad6ff10c8cf749.zip | |
[ticket/13740] Load schema_data.sql from the correct location
[ci skip]
PHPBB3-13740
| -rw-r--r-- | phpBB/config/installer/container/services_install_database.yml | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/install_database/task/add_default_data.php | 17 |
2 files changed, 12 insertions, 6 deletions
diff --git a/phpBB/config/installer/container/services_install_database.yml b/phpBB/config/installer/container/services_install_database.yml index 865f2d8ab6..061d3f6c42 100644 --- a/phpBB/config/installer/container/services_install_database.yml +++ b/phpBB/config/installer/container/services_install_database.yml @@ -18,6 +18,7 @@ services: - @installer.helper.iohandler - @installer.helper.container_factory - @language + - %core.root_path% installer.install_database.add_config_settings: class: phpbb\install\module\install_database\task\add_config_settings 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 5dbfbb4478..44b614f4de 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 @@ -44,6 +44,11 @@ class add_default_data extends \phpbb\install\task_base protected $language; /** + * @var string + */ + protected $phpbb_root_path; + + /** * Constructor * * @param \phpbb\install\helper\database $db_helper Installer's database helper @@ -51,26 +56,26 @@ class add_default_data extends \phpbb\install\task_base * @param \phpbb\install\helper\iohandler\iohandler_interface $iohandler Installer's input-output handler * @param \phpbb\install\helper\container_factory $container Installer's DI container * @param \phpbb\language\language $language Language service + * @param string $root_path Root path of phpBB */ public function __construct(\phpbb\install\helper\database $db_helper, \phpbb\install\helper\config $config, \phpbb\install\helper\iohandler\iohandler_interface $iohandler, \phpbb\install\helper\container_factory $container, - \phpbb\language\language $language) + \phpbb\language\language $language, + $root_path) { $dbms = $db_helper->get_available_dbms($config->get('dbms')); $dbms = $dbms[$config->get('dbms')]['DRIVER']; - $this->db = $container->get('dbal.conn'); //new $dbms(); + $this->db = $container->get('dbal.conn'); $this->database_helper = $db_helper; $this->config = $config; $this->iohandler = $iohandler; $this->language = $language; + $this->phpbb_root_path = $root_path; parent::__construct(true); - - // Connect to DB - //$this->db->sql_connect($config->get('dbhost'), $config->get('dbuser'), $config->get('dbpasswd'), $config->get('dbname'), $config->get('dbport'), false, false); } /** @@ -85,7 +90,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('schemas/schema_data.sql'); + $sql_query = @file_get_contents($this->phpbb_root_path . 'phpbb/install/schemas/schema_data.sql'); // Clean up SQL $sql_query = $this->replace_dbms_specific_sql($sql_query); |