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

[ticket/12612] Prefix custom UCP module function with phpbb_

Browse source 
PHPBB3-12612
This commit is contained in:
Joas Schilling 2014-06-23 22:46:20 +02:00
parent b72fdd9acf
commit 0abc1f0f97
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/functions_module.php
View file

@ -256,7 +256,7 @@ class p_master
$lang_func = '_module_' . $short_name . '_lang'; $lang_func = '_module_' . $short_name . '_lang';
// Custom function for calling parameters on module init (for example assigning template variables) // 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; $names[$row['module_basename'] . '_' . $row['module_mode']][] = true;
@ -286,6 +286,14 @@ class p_master
{ {
$custom_func($row['module_mode'], $module_row); $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 * This event allows to modify parameters for building modules list

2
phpBB/includes/functions_user.php
View file

@ -3549,7 +3549,7 @@ function phpbb_get_banned_user_ids($user_ids = array(), $ban_end = true)
/** /**
* Function for assigning a template var if the zebra module got included * Function for assigning a template var if the zebra module got included
*/ */
function _module_zebra($mode, &$module_row) function phpbb_module_zebra($mode, &$module_row)
{ {
global $template; global $template;