makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-11-18 12:26:10 +01:00
commit 20fc2b7c2e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/acp/acp_extensions.php
View file

@ -42,6 +42,9 @@ class acp_extensions
/** @var \phpbb\extension\manager */ /** @var \phpbb\extension\manager */
private $ext_manager; private $ext_manager;
private $phpbb_container;
private $php_ini;
private $u_catalog_action; private $u_catalog_action;
/** @var string */ /** @var string */
@ -50,7 +53,7 @@ class acp_extensions
function main($id, $mode) function main($id, $mode)
{ {
// Start the page // Start the page
global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path; global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_log, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path;
$this->db = $db; $this->db = $db;
$this->config = $config; $this->config = $config;
@ -60,6 +63,8 @@ class acp_extensions
$this->log = $phpbb_log; $this->log = $phpbb_log;
$this->phpbb_dispatcher = $phpbb_dispatcher; $this->phpbb_dispatcher = $phpbb_dispatcher;
$this->ext_manager = $phpbb_extension_manager; $this->ext_manager = $phpbb_extension_manager;
$this->phpbb_container = $phpbb_container;
$this->php_ini = $this->phpbb_container->get('php_ini');
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->user->add_lang(['install', 'acp/extensions', 'migrator']); $this->user->add_lang(['install', 'acp/extensions', 'migrator']);
@ -85,7 +90,7 @@ class acp_extensions
$ext_name = $this->request->variable('ext_name', ''); $ext_name = $this->request->variable('ext_name', '');
// What is a safe limit of execution time? Half the max execution time should be safe. // What is a safe limit of execution time? Half the max execution time should be safe.
$safe_time_limit = (ini_get('max_execution_time') / 2); $safe_time_limit = ($this->php_ini->getNumeric('max_execution_time') / 2);
$start_time = time(); $start_time = time();
// Cancel action // Cancel action