diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:01 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:01 -0400 |
| commit | 41becd9c92672b2d77777b8487df5dbb66851342 (patch) | |
| tree | f02bead73f1a02fb2df6a375d670007da4912484 /phpBB/includes/functions_module.php | |
| parent | 0b4abd01c89e81c6bbd4674378525664be39cffc (diff) | |
| parent | 952b4de231a87c849d654db18bb9c759fdbcb54d (diff) | |
| download | forums-41becd9c92672b2d77777b8487df5dbb66851342.tar forums-41becd9c92672b2d77777b8487df5dbb66851342.tar.gz forums-41becd9c92672b2d77777b8487df5dbb66851342.tar.bz2 forums-41becd9c92672b2d77777b8487df5dbb66851342.tar.xz forums-41becd9c92672b2d77777b8487df5dbb66851342.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12612' into develop-ascraeus
* github-nickvergessen/ticket/12612:
[ticket/12612] Prefix check_ids() with phpbb_
[ticket/12612] Prefix mcp_sorting() with phpbb_
[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
[ticket/12612] Prefix module url functions with phpbb_
[ticket/12612] Prefix upload_popup() with phpbb_
[ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
[ticket/12612] Prefix custom UCP module function with phpbb_
[ticket/12612] Prefix _sort_last_active() with phpbb_
[ticket/12612] Prefix show_profile() with phpbb and delete unused global
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index b7615e923b..86439ea03f 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -250,13 +250,25 @@ class p_master // Function for building 'url_extra' $short_name = $this->get_short_name($row['module_basename']); - $url_func = '_module_' . $short_name . '_url'; + $url_func = 'phpbb_module_' . $short_name . '_url'; + if (!function_exists($url_func)) + { + $url_func = '_module_' . $short_name . '_url'; + } // Function for building the language name - $lang_func = '_module_' . $short_name . '_lang'; + $lang_func = 'phpbb_module_' . $short_name . '_lang'; + if (!function_exists($lang_func)) + { + $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; + if (!function_exists($custom_func)) + { + $custom_func = '_module_' . $short_name; + } $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; |