diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-27 15:04:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-27 15:04:54 +0000 |
| commit | 266797fddf049d89923d9885cfecd022d9875fb3 (patch) | |
| tree | d997e17446799f149c399b2c7848ebf44471e67b /phpBB/includes/mcp/mcp_notes.php | |
| parent | 9ee570aebd300a89daffc67e24d3e33caee4653e (diff) | |
| download | forums-266797fddf049d89923d9885cfecd022d9875fb3.tar forums-266797fddf049d89923d9885cfecd022d9875fb3.tar.gz forums-266797fddf049d89923d9885cfecd022d9875fb3.tar.bz2 forums-266797fddf049d89923d9885cfecd022d9875fb3.tar.xz forums-266797fddf049d89923d9885cfecd022d9875fb3.zip | |
#10163
git-svn-id: file:///svn/phpbb/trunk@7411 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_notes.php')
| -rwxr-xr-x | phpBB/includes/mcp/mcp_notes.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index 62ff6e0a92..447d000cb4 100755 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -94,7 +94,11 @@ class mcp_notes // Populate user id to the currently active module (this module) // The following method is another way of adjusting module urls. It is the easy variant if we want // to directly adjust the current module url based on data retrieved within the same module. - $this->p_master->adjust_url('&u=' . $user_id); + if (strpos($this->u_action, "&u=$user_id") === false) + { + $this->p_master->adjust_url('&u=' . $user_id); + $this->u_action .= "&u=$user_id"; + } $deletemark = ($action == 'del_marked') ? true : false; $deleteall = ($action == 'del_all') ? true : false; @@ -140,8 +144,9 @@ class mcp_notes add_log('user', $user_id, 'LOG_USER_GENERAL', $usernote); - $redirect = $this->u_action . '&u=' . $user_id; + $redirect = $this->u_action; meta_refresh(3, $redirect); + trigger_error($user->lang['USER_FEEDBACK_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); } @@ -186,7 +191,7 @@ class mcp_notes } $template->assign_vars(array( - 'U_POST_ACTION' => $this->u_action . '&u=' . $user_id, + 'U_POST_ACTION' => $this->u_action, 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, 'S_SELECT_SORT_DIR' => $s_sort_dir, 'S_SELECT_SORT_KEY' => $s_sort_key, @@ -195,7 +200,7 @@ class mcp_notes 'L_TITLE' => $user->lang['MCP_NOTES_USER'], 'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&u=$user_id&st=$st&sk=$sk&sd=$sd", $log_count, $config['posts_per_page'], $start), + 'PAGINATION' => generate_pagination($this->u_action . "&st=$st&sk=$sk&sd=$sd", $log_count, $config['posts_per_page'], $start), 'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count), 'USERNAME' => $userrow['username'], |