aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.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/viewtopic.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/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 1b7db7958e..1a74ad3e38 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1115,7 +1115,6 @@ while ($row = $db->sql_fetchrow($result))
'rank_image' => '',
'rank_image_src' => '',
'sig' => '',
- 'profile' => '',
'pm' => '',
'email' => '',
'jabber' => '',
@@ -1180,7 +1179,6 @@ while ($row = $db->sql_fetchrow($result))
'user_colour' => $row['user_colour'],
'online' => false,
- 'profile' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&amp;u=$poster_id"),
'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
'search' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&amp;sr=posts") : '',
@@ -1626,7 +1624,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=post_details&amp;f=$forum_id&amp;p=" . $row['post_id'], true, $user->session_id) : '',
'U_DELETE' => ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
- 'U_PROFILE' => $user_cache[$poster_id]['profile'],
'U_SEARCH' => $user_cache[$poster_id]['search'],
'U_PM' => ($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_cache[$poster_id]['allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;action=quotepost&amp;p=' . $row['post_id']) : '',
'U_EMAIL' => $user_cache[$poster_id]['email'],