aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-07-27 19:42:10 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-07-27 19:42:10 +0200
commitfdb756e63376d3344b0f7f27d17551a4c68f438b (patch)
tree8a1858404129b776c6e95622d8fd7d41fade1bf2
parent2de19d1cefcb0d4757f04260176bd2ba7d1d04d3 (diff)
parent64f2d778cd4f08061e968c3edd4dbac4cae92512 (diff)
downloadforums-fdb756e63376d3344b0f7f27d17551a4c68f438b.tar
forums-fdb756e63376d3344b0f7f27d17551a4c68f438b.tar.gz
forums-fdb756e63376d3344b0f7f27d17551a4c68f438b.tar.bz2
forums-fdb756e63376d3344b0f7f27d17551a4c68f438b.tar.xz
forums-fdb756e63376d3344b0f7f27d17551a4c68f438b.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12896] Add php event for admin notices
-rw-r--r--phpBB/includes/acp/acp_main.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 0d0d49774c..2a28226d6c 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -26,7 +26,7 @@ class acp_main
function main($id, $mode)
{
global $config, $db, $cache, $user, $auth, $template, $request;
- global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container;
+ global $phpbb_root_path, $phpbb_admin_path, $phpEx, $phpbb_container, $phpbb_dispatcher;
// Show restore permissions notice
if ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm'))
@@ -445,6 +445,14 @@ class acp_main
));
}
+ /**
+ * Notice admin
+ *
+ * @event core.acp_main_notice
+ * @since 3.1.0-RC3
+ */
+ $phpbb_dispatcher->dispatch('core.acp_main_notice');
+
// Get forum statistics
$total_posts = $config['num_posts'];
$total_topics = $config['num_topics'];