diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 21:44:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-08 21:44:59 +0000 |
| commit | 1aa40171e0677c5307f213f8c58b7156f5885d59 (patch) | |
| tree | cf0721c95893f960cdaef194efef82698a3e824e /phpBB/includes/mcp/mcp_warn.php | |
| parent | 6a59f3efd68ad9467d053bd151273e898ce65504 (diff) | |
| download | forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.gz forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.bz2 forums-1aa40171e0677c5307f213f8c58b7156f5885d59.tar.xz forums-1aa40171e0677c5307f213f8c58b7156f5885d59.zip | |
merge...
git-svn-id: file:///svn/phpbb/trunk@8624 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 1ca40cb841..4d38d05b57 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -167,7 +167,7 @@ class mcp_warn 'USERNAME' => $row['username'], 'USERNAME_COLOUR' => ($row['user_colour']) ? '#' . $row['user_colour'] : '', 'U_USER' => append_sid('memberlist', 'mode=viewprofile&u=' . $row['user_id']), - + 'WARNING_TIME' => $user->format_date($row['user_last_warning']), 'WARNINGS' => $row['user_warnings'], )); @@ -258,11 +258,11 @@ class mcp_warn } $redirect = append_sid('mcp', "i=notes&mode=user_notes&u=$user_id"); meta_refresh(2, $redirect); - trigger_error($user->lang['USER_WARNING_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); + trigger_error($msg . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>')); } // OK, they didn't submit a warning so lets build the page for them to do so - + // We want to make the message available here as a reminder // Parse the message and subject $message = censor_text($user_row['post_text']); |