diff options
author | Michal Čihař <michal@cihar.com> | 2016-12-21 13:26:52 +0300 |
---|---|---|
committer | Michal Čihař <michal@cihar.com> | 2017-01-07 12:59:39 +0300 |
commit | 801485a7f43998a633a857bd4a00ad085138937d (patch) | |
tree | eeeb972cff8c46c17727d2d77240cfd2f4c78873 /libraries | |
parent | f8ad5bd759156c8c00a1c3e0ef374660027a3bb4 (diff) |
Remove setup download/load/delete features
This removes risk of third party manipulating with the configuration as
there was race condition between editing and using the file.
Downloading the file should not be big hassle and this really makes the
whole setup a bit simpler.
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/config/ConfigFile.class.php | 15 | ||||
-rw-r--r-- | libraries/vendor_config.php | 11 |
2 files changed, 0 insertions, 26 deletions
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 238f0b0817..bdc86bd11f 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -487,21 +487,6 @@ class ConfigFile } /** - * Returns config file path, relative to phpMyAdmin's root path - * - * @return string - */ - public function getFilePath() - { - // Load paths - if (!defined('SETUP_CONFIG_FILE')) { - include_once './libraries/vendor_config.php'; - } - - return SETUP_CONFIG_FILE; - } - - /** * Returns configuration array (full, multidimensional format) * * @return array diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 92356f3aef..ef4ae56bfa 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -26,17 +26,6 @@ define('CHANGELOG_FILE', './ChangeLog'); define('LICENSE_FILE', './LICENSE'); /** - * Path to config file generated using setup script. - */ -define('SETUP_CONFIG_FILE', './config/config.inc.php'); - -/** - * Whether setup requires writable directory where config - * file will be generated. - */ -define('SETUP_DIR_WRITABLE', true); - -/** * Directory where configuration files are stored. * It is not used directly in code, just a convenient * define used further in this file. |