diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-11-11 12:22:20 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-11-11 12:22:20 +0100 |
| commit | 7801bac09ac1fb5a10c0c518e1e7639233855220 (patch) | |
| tree | ce042bf0f0d978e81a5f9473e2f42845bba6121f /phpBB/phpbb/install/module/install_database | |
| parent | f4063e475dff62f68bdd4c813bf3450492abb3c1 (diff) | |
| parent | 023ec01611123c426a5aeaf812e50fb1ade43c0e (diff) | |
| download | forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.gz forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.bz2 forums-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.xz forums-7801bac09ac1fb5a10c0c518e1e7639233855220.zip | |
Merge branch 'prep-release-3.2.4' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/install/module/install_database')
| -rw-r--r-- | phpBB/phpbb/install/module/install_database/task/add_config_settings.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php index 54114e3f9c..ba439609ff 100644 --- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php +++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php @@ -151,10 +151,6 @@ class add_config_settings extends \phpbb\install\task_base VALUES ('default_lang', '" . $this->db->sql_escape($this->install_config->get('default_lang')) . "')", 'UPDATE ' . $this->config_table . " - SET config_value = '" . $this->db->sql_escape($this->install_config->get('img_imagick')) . "' - WHERE config_name = 'img_imagick'", - - 'UPDATE ' . $this->config_table . " SET config_value = '" . $this->db->sql_escape($this->install_config->get('server_name')) . "' WHERE config_name = 'server_name'", |