makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5442 from rxu/ticket/15871

Browse source 
[ticket/15871] Fix PHP 7.1+ warning in ACP extensions module
This commit is contained in:
Marc Alexander 2018-11-18 12:24:16 +01:00
commit 5b3eb2d61c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,11 +35,13 @@ class acp_extensions
private $request; private $request;
private $phpbb_dispatcher; private $phpbb_dispatcher;
private $ext_manager; private $ext_manager;
private $phpbb_container;
private $php_ini;
function main() function main()
{ {
// Start the page // 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->config = $config;
$this->template = $template; $this->template = $template;
@ -48,6 +50,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->user->add_lang(array('install', 'acp/extensions', 'migrator')); $this->user->add_lang(array('install', 'acp/extensions', 'migrator'));
@ -57,7 +61,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