diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-12 18:14:28 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-12 18:14:28 +0000 |
commit | d0f2399a863c4c60cdde91d9c89a175f86b494c8 (patch) | |
tree | 22d14c0dca0e3c3da1b92dd461893264d0171889 /phpBB/includes/functions_content.php | |
parent | e365b6abfa5668a986e58ebf50d4d9b4e847cb72 (diff) | |
download | forums-d0f2399a863c4c60cdde91d9c89a175f86b494c8.tar forums-d0f2399a863c4c60cdde91d9c89a175f86b494c8.tar.gz forums-d0f2399a863c4c60cdde91d9c89a175f86b494c8.tar.bz2 forums-d0f2399a863c4c60cdde91d9c89a175f86b494c8.tar.xz forums-d0f2399a863c4c60cdde91d9c89a175f86b494c8.zip |
some bugfixes
git-svn-id: file:///svn/phpbb/trunk@8168 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_content.php')
-rw-r--r-- | phpBB/includes/functions_content.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 5e0780f048..cbd38cd478 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -99,11 +99,12 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, /** * Generate Jumpbox */ -function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false) +function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false) { global $config, $auth, $template, $user, $db; - if (!$config['load_jumpbox']) + // We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality) + if (!$config['load_jumpbox'] && $force_display === false) { return; } |