diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 09:54:14 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-05 09:54:14 +0200 |
| commit | ced48a51a4a6ffca6a3fd2e3982b236bfa3a199c (patch) | |
| tree | 82221065d31ebe9f68bb5df15ca280ff052e3e6d /phpBB/includes/acp | |
| parent | bd36ca101654000bb91127d8f1c3db881a9deaf1 (diff) | |
| parent | 8f525e1ef5777c1dc77d7eb4d43039c5dd059f88 (diff) | |
| download | forums-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/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index fd45027b49..4512905539 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -40,11 +40,7 @@ class acp_main $user_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - $perm_from = '<strong' . (($user_row['user_colour']) ? ' style="color: #' . $user_row['user_colour'] . '">' : '>'); - $perm_from .= ($user_row['user_id'] != ANONYMOUS) ? '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $user_row['user_id']) . '">' : ''; - $perm_from .= $user_row['username']; - $perm_from .= ($user_row['user_id'] != ANONYMOUS) ? '</a>' : ''; - $perm_from .= '</strong>'; + $perm_from = get_username_string('full', $user_row['user_id'], $user_row['username'], $user_row['user_colour']); $template->assign_vars(array( 'S_RESTORE_PERMISSIONS' => true, diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index 0f9ca9bab3..d0e5dfb5f4 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -294,7 +294,7 @@ class acp_prune $template->assign_block_vars('users', array( 'USERNAME' => $usernames[$user_id], 'USER_ID' => $user_id, - 'U_PROFILE' => append_sid($phpbb_root_path . 'memberlist.' . $phpEx, 'mode=viewprofile&u=' . $user_id), + 'U_PROFILE' => get_username_string('profile', $user_id, $usernames[$user_id]), 'U_USER_ADMIN' => ($auth->acl_get('a_user')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview&u=' . $user_id, true, $user->session_id) : '', )); } diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index a023bced0a..5404efded3 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -649,9 +649,9 @@ class auth_admin extends \phpbb\auth\auth { $template->assign_block_vars('role_mask.users', array( 'USER_ID' => $row['user_id'], - 'USERNAME' => $row['username'], - 'U_PROFILE' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u={$row['user_id']}")) - ); + 'USERNAME' => get_username_string('username', $row['user_id'], $row['username']), + 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username']), + )); } $db->sql_freeresult($result); } |