aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuslan Uzdenov <rxu@mail.ru>2010-01-24 16:00:18 +0000
committerRuslan Uzdenov <rxu@mail.ru>2010-01-24 16:00:18 +0000
commitb44288e0cfe43614d6d6ad1546060c16a70b173f (patch)
treebf2c72753bf5d89bf576f30e5bc25c0c5ab956a3
parent04ce664604592623f72c12edc34994cc65a4d010 (diff)
downloadforums-b44288e0cfe43614d6d6ad1546060c16a70b173f.tar
forums-b44288e0cfe43614d6d6ad1546060c16a70b173f.tar.gz
forums-b44288e0cfe43614d6d6ad1546060c16a70b173f.tar.bz2
forums-b44288e0cfe43614d6d6ad1546060c16a70b173f.tar.xz
forums-b44288e0cfe43614d6d6ad1546060c16a70b173f.zip
Fix bug #55045 - Do not duplicate previous/next links in pagination text of moderator logs and user notes in MCP for subsilver2.
Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10433 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/mcp/mcp_logs.php2
-rw-r--r--phpBB/includes/mcp/mcp_notes.php2
3 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index e701683db9..e0e3c327db 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -139,6 +139,7 @@
<li>[Fix] Load reCAPTCHA over https when using a secure connection to the board. (Bug #55755)</li>
<li>[Fix] Clarify explanation of bump feature setting. (Bug #56075)</li>
<li>[Fix] Properly paginate unapproved posts in the MCP. (Bug #56285)</li>
+ <li>[Fix] Do not duplicate previous/next links in pagination text of moderator logs and user notes in MCP for subsilver2. (Bug #55045)</li>
<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index 429e19b668..6da810a489 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -175,7 +175,7 @@ class mcp_logs
$template->assign_vars(array(
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
- 'PAGINATION' => generate_pagination($this->u_action . "&amp;$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
+ 'PAGINATION' => generate_pagination($this->u_action . "&amp;$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start),
'L_TITLE' => $user->lang['MCP_LOGS'],
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 2ba2fa7f11..c684eb6f52 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -227,7 +227,7 @@ class mcp_notes
'L_TITLE' => $user->lang['MCP_NOTES_USER'],
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
- 'PAGINATION' => generate_pagination($this->u_action . "&amp;$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
+ 'PAGINATION' => generate_pagination($this->u_action . "&amp;$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start),
'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count),
'RANK_TITLE' => $rank_title,