diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:45 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:45 -0400 |
| commit | 10d963a94e6be18c988d38bba7c235e260b6c8a5 (patch) | |
| tree | ed36ae9f08fb621a8c3b1da1a66a1e5e63750252 /phpBB/includes/functions_user.php | |
| parent | 5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886 (diff) | |
| parent | 41becd9c92672b2d77777b8487df5dbb66851342 (diff) | |
| download | forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.gz forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.bz2 forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.xz forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 3422236d19..d11193e4b0 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -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 _module_zebra($mode, &$module_row) +function phpbb_module_zebra($mode, &$module_row) { global $template; |