diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-24 10:08:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-24 10:08:18 +0000 |
| commit | f9bbf10a80c7a22a1ff59e30eef1cf9873e46516 (patch) | |
| tree | c38514d9708c53172a60362d3daff17a91d8243f /phpBB/includes/functions.php | |
| parent | e8638ff0ef36c3305e8f9136552439c858fae4b5 (diff) | |
| download | forums-f9bbf10a80c7a22a1ff59e30eef1cf9873e46516.tar forums-f9bbf10a80c7a22a1ff59e30eef1cf9873e46516.tar.gz forums-f9bbf10a80c7a22a1ff59e30eef1cf9873e46516.tar.bz2 forums-f9bbf10a80c7a22a1ff59e30eef1cf9873e46516.tar.xz forums-f9bbf10a80c7a22a1ff59e30eef1cf9873e46516.zip | |
- Fix XHTML for r9666
- Utilize $captcha->solved property
- Only validate captcha once to retain captcha mode over switching from/to agreement page
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9668 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 12b9363ec4..30bdc9abce 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2265,7 +2265,7 @@ function reapply_sid($url) { // All kind of links $url = preg_replace('/(\?)?(&|&)?sid=[a-z0-9]+/', '', $url); - // if the sid was the first param, make the old second as first ones + // if the sid was the first param, make the old second as first ones $url = preg_replace("/$phpEx(&|&)+?/", "$phpEx?", $url); } @@ -3844,6 +3844,8 @@ function page_header($page_title = '', $display_online_list = true) 'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'), 'U_DELETE_COOKIES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'), 'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=leaders'), + 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), + 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), 'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', 'U_FEED' => generate_board_url() . "/feed.$phpEx", |