aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style/simple_header.html
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-04-17 16:05:25 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-04-17 16:05:25 +0000
commit4307a2c07f6559a71c3cf67f0cde60704ee373ea (patch)
tree5ea5923c11a3931b2d74c1f52fce32c75be4a854 /phpBB/adm/style/simple_header.html
parent77e21fc054abb722522e4694813149770980249a (diff)
downloadforums-4307a2c07f6559a71c3cf67f0cde60704ee373ea.tar
forums-4307a2c07f6559a71c3cf67f0cde60704ee373ea.tar.gz
forums-4307a2c07f6559a71c3cf67f0cde60704ee373ea.tar.bz2
forums-4307a2c07f6559a71c3cf67f0cde60704ee373ea.tar.xz
forums-4307a2c07f6559a71c3cf67f0cde60704ee373ea.zip
Changed jumpto() JS function to be more fail-safe. (But #27635 - patch by peterkclee)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9466 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/simple_header.html')
-rw-r--r--phpBB/adm/style/simple_header.html11
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 3e36c47988..2339b70a93 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -39,9 +39,16 @@ function jumpto()
{
var page = prompt(jump_page, on_page);
- if (page !== null && !isNaN(page) && page > 0)
+ if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0)
{
- document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+ if (base_url.indexOf('?') == -1)
+ {
+ document.location.href = base_url + '?start=' + ((page - 1) * per_page);
+ }
+ else
+ {
+ document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
+ }
}
}