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/auth.php | |
| 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/auth.php')
| -rw-r--r-- | phpBB/includes/acp/auth.php | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |