diff options
| author | n-aleha <nick_aleha@myway.com> | 2014-05-25 22:05:34 +0300 |
|---|---|---|
| committer | n-aleha <nick_aleha@myway.com> | 2014-05-25 22:40:20 +0300 |
| commit | 62cb7e0c1064b5724c60a24a9052416556879305 (patch) | |
| tree | 3727a87b2dbf86b54087ac9c193e1fc8c968c991 /phpBB | |
| parent | fdb53b23fbb4509619ff35982cd453362594a566 (diff) | |
| download | forums-62cb7e0c1064b5724c60a24a9052416556879305.tar forums-62cb7e0c1064b5724c60a24a9052416556879305.tar.gz forums-62cb7e0c1064b5724c60a24a9052416556879305.tar.bz2 forums-62cb7e0c1064b5724c60a24a9052416556879305.tar.xz forums-62cb7e0c1064b5724c60a24a9052416556879305.zip | |
[ticket/12584] Redirect only on non-empty $message
PHPBB3-12584
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 57d0aed94d..9f368727f6 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -424,9 +424,13 @@ class mcp_warn { $message = $user->lang['FORM_INVALID']; } - $redirect = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=notes&mode=user_notes&u=$user_id"); - meta_refresh(2, $redirect); - trigger_error($message . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); + + if (!empty($message)) + { + $redirect = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=notes&mode=user_notes&u=$user_id"); + meta_refresh(2, $redirect); + trigger_error($message . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); + } } // Generate the appropriate user information for the user we are looking at |