mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus

Browse Source 
* github-nickvergessen/ticket/12273: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
This commit is contained in:
Nils Adermann
2014-05-02 12:22:05 +02:00
parent d36795b844 7f90ff70ac
commit 7c2239e75c
44 changed files with 2463 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/mcp.php
View File

@@ -197,7 +197,8 @@ if ($quickmod)
* @var bool is_valid_action Flag indicating if the action was handled properly
* @since 3.1.0-a4
*/
extract($phpbb_dispatcher->trigger_event('core.modify_quickmod_options', compact(array('module', 'action', 'is_valid_action'))));
$vars = array('module', 'action', 'is_valid_action');
extract($phpbb_dispatcher->trigger_event('core.modify_quickmod_options', compact($vars)));
if (!$is_valid_action)
{
@@ -266,7 +267,16 @@ if (!$user_id && $username == '')
* @var int id Parent module id
* @since 3.1.0-b2
*/
$vars = array('module', 'mode', 'user_id', 'forum_id', 'topic_id', 'post_id', 'username', 'id');
$vars = array(
'module',
'mode',
'user_id',
'forum_id',
'topic_id',
'post_id',
'username',
'id',
);
extract($phpbb_dispatcher->trigger_event('core.modify_mcp_modules_display_option', compact($vars)));
// Load and execute the relevant module