diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-12-30 13:12:02 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-12-30 13:12:02 +0000 |
| commit | 267692ad5c9aa8e337b4450f95051571b5a761ad (patch) | |
| tree | 7ac3d9a7fb550346659532843b807f17d4fd4e4e | |
| parent | 5c3788b9c0ad6b97a591d8c43084e43cf397bff4 (diff) | |
| download | forums-267692ad5c9aa8e337b4450f95051571b5a761ad.tar forums-267692ad5c9aa8e337b4450f95051571b5a761ad.tar.gz forums-267692ad5c9aa8e337b4450f95051571b5a761ad.tar.bz2 forums-267692ad5c9aa8e337b4450f95051571b5a761ad.tar.xz forums-267692ad5c9aa8e337b4450f95051571b5a761ad.zip | |
Bug #56025 - Pagination of User Notes in MCP uses two different config values.
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10391 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_notes.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7c3eab1f0f..0128578e51 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -128,6 +128,7 @@ <li>[Fix] Correctly move sql_row_pointer forward when calling sql_fetchfield() on cached queries. (Bug #55865)</li> <li>[Fix] Remove item limit from "All forums" feed.</li> <li>[Fix] Do not use group colours for usernames on print view. (Bug #30315 - Patch by Pasqualle)</li> + <li>[Fix] Pagination of User Notes in MCP uses two different config values. (Bug #56025)</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_notes.php b/phpBB/includes/mcp/mcp_notes.php index 757860e1af..fe37397834 100644 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -226,7 +226,7 @@ class mcp_notes 'L_TITLE' => $user->lang['MCP_NOTES_USER'], - 'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start), + 'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start), 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true), 'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count), |