aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_extensions.php
diff options
context:
space:
mode:
authorrxu <rxu@mail.ru>2018-11-11 20:36:49 +0700
committerrxu <rxu@mail.ru>2018-11-11 20:36:49 +0700
commitb03da3a9b2c3139068b0c47e9c440b08460958c7 (patch)
tree2b03f034e4ceea2b03e30a5707f1258b46b0cd4f /phpBB/includes/acp/acp_extensions.php
parent720477a9da9e3613c2cb432315970a0dddd7fb0e (diff)
downloadforums-b03da3a9b2c3139068b0c47e9c440b08460958c7.tar
forums-b03da3a9b2c3139068b0c47e9c440b08460958c7.tar.gz
forums-b03da3a9b2c3139068b0c47e9c440b08460958c7.tar.bz2
forums-b03da3a9b2c3139068b0c47e9c440b08460958c7.tar.xz
forums-b03da3a9b2c3139068b0c47e9c440b08460958c7.zip
[ticket/15871] Use php_ini service
PHPBB3-15871
Diffstat (limited to 'phpBB/includes/acp/acp_extensions.php')
-rw-r--r--phpBB/includes/acp/acp_extensions.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index c8c16445f7..9853ad8722 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -35,11 +35,12 @@ class acp_extensions
private $request;
private $phpbb_dispatcher;
private $ext_manager;
+ private $phpbb_container;
function main()
{
// Start the page
- global $config, $user, $template, $request, $phpbb_extension_manager, $phpbb_root_path, $phpbb_log, $phpbb_dispatcher;
+ global $config, $user, $template, $request, $phpbb_extension_manager, $phpbb_root_path, $phpbb_log, $phpbb_dispatcher, $phpbb_container;
$this->config = $config;
$this->template = $template;
@@ -48,6 +49,8 @@ class acp_extensions
$this->log = $phpbb_log;
$this->phpbb_dispatcher = $phpbb_dispatcher;
$this->ext_manager = $phpbb_extension_manager;
+ $this->phpbb_container = $phpbb_container;
+ $this->php_ini = $this->phpbb_container->get('php_ini');
$this->user->add_lang(array('install', 'acp/extensions', 'migrator'));
@@ -57,7 +60,7 @@ class acp_extensions
$ext_name = $this->request->variable('ext_name', '');
// What is a safe limit of execution time? Half the max execution time should be safe.
- $safe_time_limit = ((int) ini_get('max_execution_time') / 2);
+ $safe_time_limit = ($this->php_ini->getNumeric('max_execution_time') / 2);
$start_time = time();
// Cancel action