aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-06-08 10:43:32 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-06-08 10:43:32 +0000
commit481b63f6fe318bf691b520339282983cbca6cf33 (patch)
tree75fc7a29fe8c9326e719bd7aec204ce070e93f09 /phpBB/includes
parent49235d6ed5dd4cac42ddcc3cab75b05f976c5d13 (diff)
downloadforums-481b63f6fe318bf691b520339282983cbca6cf33.tar
forums-481b63f6fe318bf691b520339282983cbca6cf33.tar.gz
forums-481b63f6fe318bf691b520339282983cbca6cf33.tar.bz2
forums-481b63f6fe318bf691b520339282983cbca6cf33.tar.xz
forums-481b63f6fe318bf691b520339282983cbca6cf33.zip
#25705
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8621 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/mcp/mcp_warn.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 315a2c1362..7c17de9f43 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -170,7 +170,7 @@ class mcp_warn
'USERNAME' => $row['username'],
'USERNAME_COLOUR' => ($row['user_colour']) ? '#' . $row['user_colour'] : '',
'U_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['user_id']),
-
+
'WARNING_TIME' => $user->format_date($row['user_last_warning']),
'WARNINGS' => $row['user_warnings'],
));
@@ -262,11 +262,11 @@ class mcp_warn
}
$redirect = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=notes&amp;mode=user_notes&amp;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']);