diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index ebc76c36a3..e839fb1bda 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -70,8 +70,8 @@
-
- +
+
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index b1d9b4af11..885809ffe2 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -44,7 +44,7 @@

-   +  

{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index b4386d5f19..63583093b0 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -3,7 +3,7 @@ - +

{L_ACP_PERMISSIONS}

{L_ACP_PERMISSIONS_EXPLAIN} @@ -12,10 +12,12 @@ + « {L_BACK} +

{L_TITLE}

{L_EXPLAIN}

- +

{L_FORUMS}: {FORUM_NAMES}

@@ -62,7 +64,7 @@ - + @@ -123,7 +125,7 @@
- +
{S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -154,7 +156,7 @@
- +

{L_USERGROUPS}

@@ -168,7 +170,7 @@
- +
{S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -177,7 +179,7 @@
- +
{L_ADD_GROUPS}
@@ -199,7 +201,7 @@
- +

{L_USERS}

@@ -210,7 +212,7 @@
- +
{S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -240,7 +242,7 @@
- +

{L_USERGROUPS}

@@ -251,7 +253,7 @@
- +
{S_HIDDEN_FIELDS} {S_FORM_TOKEN} @@ -311,11 +313,11 @@ - +
{S_HIDDEN_FIELDS} {S_FORM_TOKEN} - {L_SELECT_TYPE}: + {L_SELECT_TYPE}:
@@ -347,7 +349,7 @@


- +
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 0879780749..5fd7a23d97 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -32,6 +32,10 @@

{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}
+
+

{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}
+
+

{L_SEARCH_STORE_RESULTS_EXPLAIN}
{L_SECONDS}
@@ -130,9 +134,9 @@ - + - +

@@ -142,7 +146,7 @@

{S_FORM_TOKEN}
- + diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index adafc0aa6d..93d72d5205 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -28,9 +28,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(/&/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(/&/g, '&') + '&start=' + ((page - 1) * per_page); + } } } @@ -71,7 +78,7 @@ function marklist(id, name, state) } var rb = parent.getElementsByTagName('input'); - + for (var r = 0; r < rb.length; r++) { if (rb[r].name.substr(0, name.length) == name) @@ -166,7 +173,7 @@ function switch_menu()

{L_ADMIN_INDEX}{L_FORUM_INDEX}

{L_SKIP}

- +