diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-27 10:51:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:29:05 +0200 |
| commit | 16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11 (patch) | |
| tree | e4f44b05770bebca7b39ee07561268ea1e0ecbd9 /phpBB/phpbb/install | |
| parent | b2957b9d6543737076d96209ba0f12e2fc145a9a (diff) | |
| download | forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar.gz forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar.bz2 forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.tar.xz forums-16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11.zip | |
[ticket/13904] Modify files for changes in ini wrapper
PHPBB3-13904
Diffstat (limited to 'phpBB/phpbb/install')
| -rw-r--r-- | phpBB/phpbb/install/helper/config.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php index b0480e7e5b..d5653f1924 100644 --- a/phpBB/phpbb/install/helper/config.php +++ b/phpBB/phpbb/install/helper/config.php @@ -41,7 +41,7 @@ class config protected $install_config_file; /** - * @var \phpbb\php\ini + * @var \bantu\IniGetWrapper\IniGetWrapper */ protected $php_ini; @@ -83,7 +83,7 @@ class config /** * Constructor */ - public function __construct(\phpbb\filesystem\filesystem_interface $filesystem, \phpbb\php\ini $php_ini, $phpbb_root_path) + public function __construct(\phpbb\filesystem\filesystem_interface $filesystem, \bantu\IniGetWrapper\IniGetWrapper $php_ini, $phpbb_root_path) { $this->filesystem = $filesystem; $this->php_ini = $php_ini; @@ -373,7 +373,7 @@ class config protected function setup_system_data() { // Query maximum runtime from php.ini - $execution_time = $this->php_ini->get_int('max_execution_time'); + $execution_time = $this->php_ini->getNumeric('max_execution_time'); $execution_time = min(15, $execution_time / 2); $this->system_data['max_execution_time'] = $execution_time; @@ -381,6 +381,6 @@ class config $this->system_data['start_time'] = time(); // Get memory limit - $this->system_data['memory_limit'] = $this->php_ini->get_bytes('memory_limit'); + $this->system_data['memory_limit'] = $this->php_ini->getBytes('memory_limit'); } } |