aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_warn.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-05 09:54:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-04-05 09:54:14 +0200
commitced48a51a4a6ffca6a3fd2e3982b236bfa3a199c (patch)
tree82221065d31ebe9f68bb5df15ca280ff052e3e6d /phpBB/includes/mcp/mcp_warn.php
parentbd36ca101654000bb91127d8f1c3db881a9deaf1 (diff)
parent8f525e1ef5777c1dc77d7eb4d43039c5dd059f88 (diff)
downloadforums-ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c.tar
forums-ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c.tar.gz
forums-ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c.tar.bz2
forums-ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c.tar.xz
forums-ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c.zip
Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeus
* Elsensee/ticket/7707: [ticket/7707] Fix undefined variable: perm_from [ticket/7707] Add comma to last entry of arrays [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() once more [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() where possible
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
-rw-r--r--phpBB/includes/mcp/mcp_warn.php9
1 files changed, 0 insertions, 9 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 768b7c991d..4275182d26 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -96,9 +96,6 @@ class mcp_warn
'U_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $row['user_id']),
'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
- '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'],
@@ -118,9 +115,6 @@ class mcp_warn
'U_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $row['user_id']),
'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
- '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['warning_time']),
'WARNINGS' => $row['user_warnings'],
@@ -167,9 +161,6 @@ class mcp_warn
'U_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&amp;mode=user_notes&amp;u=' . $row['user_id']),
'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
- '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'],