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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-11-16 21:57:49 +01:00
commit 32667f6290
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ class acp_extensions
function main() function main()
{ {
// Start the page // Start the page
global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_root_path, $phpbb_log, $cache; global $config, $user, $template, $request, $phpbb_extension_manager, $db, $phpbb_root_path, $phpbb_log, $cache, $phpbb_dispatcher;
$this->db = $db; $this->db = $db;
$this->config = $config; $this->config = $config;
@ -43,6 +43,7 @@ class acp_extensions
$this->cache = $cache; $this->cache = $cache;
$this->request = $request; $this->request = $request;
$this->log = $phpbb_log; $this->log = $phpbb_log;
$this->phpbb_dispatcher = $phpbb_dispatcher;
$user->add_lang(array('install', 'acp/extensions', 'migrator')); $user->add_lang(array('install', 'acp/extensions', 'migrator'));
@ -55,6 +56,21 @@ class acp_extensions
$safe_time_limit = (ini_get('max_execution_time') / 2); $safe_time_limit = (ini_get('max_execution_time') / 2);
$start_time = time(); $start_time = time();
/**
* Event to run a specific action on extension
*
* @event core.acp_extensions_run_action
* @var string action Action to run
* @var string u_action Url we are at
* @var string ext_name Extension name from request
* @var int safe_time_limit Safe limit of execution time
* @var int start_time Start time
* @since 3.1.11-RC1
*/
$u_action = $this->u_action;
$vars = array('action', 'u_action', 'ext_name', 'safe_time_limit', 'start_time');
extract($this->phpbb_dispatcher->trigger_event('core.acp_extensions_run_action', compact($vars)));
// Cancel action // Cancel action
if ($request->is_set_post('cancel')) if ($request->is_set_post('cancel'))
{ {