aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-23 22:46:20 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-23 22:46:20 +0200
commit0abc1f0f973e916f12b0c5cf0e844c991f63c552 (patch)
tree07df0f21a736e20aa6130818dc5fc9ee9e923094 /phpBB/includes/functions_module.php
parentb72fdd9acfc78f6cfb3b0bc21798e5d7d9bf0189 (diff)
downloadforums-0abc1f0f973e916f12b0c5cf0e844c991f63c552.tar
forums-0abc1f0f973e916f12b0c5cf0e844c991f63c552.tar.gz
forums-0abc1f0f973e916f12b0c5cf0e844c991f63c552.tar.bz2
forums-0abc1f0f973e916f12b0c5cf0e844c991f63c552.tar.xz
forums-0abc1f0f973e916f12b0c5cf0e844c991f63c552.zip
[ticket/12612] Prefix custom UCP module function with phpbb_
PHPBB3-12612
Diffstat (limited to 'phpBB/includes/functions_module.php')
-rw-r--r--phpBB/includes/functions_module.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index b7615e923b..41c6f0118e 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -256,7 +256,7 @@ class p_master
$lang_func = '_module_' . $short_name . '_lang';
// Custom function for calling parameters on module init (for example assigning template variables)
- $custom_func = '_module_' . $short_name;
+ $custom_func = 'phpbb_module_' . $short_name;
$names[$row['module_basename'] . '_' . $row['module_mode']][] = true;
@@ -286,6 +286,14 @@ class p_master
{
$custom_func($row['module_mode'], $module_row);
}
+ else
+ {
+ $custom_func = '_module_' . $short_name;
+ if (function_exists($custom_func))
+ {
+ $custom_func($row['module_mode'], $module_row);
+ }
+ }
/**
* This event allows to modify parameters for building modules list