diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-09-03 13:59:31 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-09-03 13:59:31 +0000 |
| commit | 4c6360f5b5766900c5d86e5522be1a622f15b345 (patch) | |
| tree | 737f538843403b067ee7225b9029651ee65e5f54 /phpBB/includes/functions.php | |
| parent | 19086ba57289be4101131095aeeb615de2bc5639 (diff) | |
| download | forums-4c6360f5b5766900c5d86e5522be1a622f15b345.tar forums-4c6360f5b5766900c5d86e5522be1a622f15b345.tar.gz forums-4c6360f5b5766900c5d86e5522be1a622f15b345.tar.bz2 forums-4c6360f5b5766900c5d86e5522be1a622f15b345.tar.xz forums-4c6360f5b5766900c5d86e5522be1a622f15b345.zip | |
#50675 ; also don't reset the captcha on login
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10094 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8957633ec7..69d764b7aa 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2082,7 +2082,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add } $on_page = floor($start_item / $per_page) + 1; - $url_delim = (strpos($base_url, '?') === false) ? '?' : '&'; + $url_delim = (strpos($base_url, '?') === false) ? '?' : ((strpos($base_url, '?') === strlen($base_url) - 1) ? '' : '&'); $page_string = ($on_page == 1) ? '<strong>1</strong>' : '<a href="' . $base_url . '">1</a>'; @@ -2949,7 +2949,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa $captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']); $captcha->init(CONFIRM_LOGIN); - $captcha->reset(); + // $captcha->reset(); $template->assign_vars(array( 'CAPTCHA_TEMPLATE' => $captcha->get_template(), |