diff options
| author | Crizzo <mail@crizzo.de> | 2014-06-14 15:57:20 +0200 |
|---|---|---|
| committer | Crizzo <mail@crizzo.de> | 2014-06-14 15:57:20 +0200 |
| commit | 8a5cb4a026e9e3f9f687cb192c2f10806a3f14f1 (patch) | |
| tree | 1f24379961715f38339a99d6d0223dd22fa43648 /phpBB | |
| parent | af60861cfd13d1226776ecf85a163a4061a731b5 (diff) | |
| download | forums-8a5cb4a026e9e3f9f687cb192c2f10806a3f14f1.tar forums-8a5cb4a026e9e3f9f687cb192c2f10806a3f14f1.tar.gz forums-8a5cb4a026e9e3f9f687cb192c2f10806a3f14f1.tar.bz2 forums-8a5cb4a026e9e3f9f687cb192c2f10806a3f14f1.tar.xz forums-8a5cb4a026e9e3f9f687cb192c2f10806a3f14f1.zip | |
[ticket/12680] Little changes, but some issues are still there
PHPBB3-12680
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 4 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index fc568abc68..11a0f59874 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -204,6 +204,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'AUTHOR_AVATAR' => (isset($user_info['avatar'])) ? $user_info['avatar'] : '', 'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']), 'AUTHOR_POSTS' => (int) $user_info['user_posts'], + 'CONTACT_USER' => $user->lang('CONTACT_USER' . get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username'])), //$row['contact_user'], 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])), 'S_ONLINE' => (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false), diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 84ab6ecb44..9f33bc04f7 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -38,7 +38,7 @@ <dd class="profile-contact"> <strong>{L_CONTACT}{L_COLON}</strong> <div class="dropdown-container dropdown-left"> - <a href="#" class="dropdown-trigger"><span class="imageset icon_contact"></span></a> + <a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{CONTACT_USER}">{CONTACT_USER}</span></a> <div class="dropdown hidden"> <div class="pointer"><div class="pointer-inner"></div></div> <div class="dropdown-contents contact-icons"> @@ -49,7 +49,7 @@ <div> <!-- ENDIF --> <a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 550, 320); return false;"<!-- ENDIF -->> - <span class="contact-icon {contact.ID}-icon"></span> + <span class="contact-icon {contact.ID}-icon">{contact.NAME}</span> </a> <!-- IF REMAINDER eq 3 or contact.S_LAST_ROW --> </div> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index be35b7baa0..10be5a09cb 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1061,7 +1061,6 @@ while ($row = $db->sql_fetchrow($result)) 'post_time' => $row['post_time'], 'user_id' => $row['user_id'], 'username' => $row['username'], - 'contact_user' => $user->lang('CONTACT_USER', $row['username']), 'user_colour' => $row['user_colour'], 'topic_id' => $row['topic_id'], 'forum_id' => $row['forum_id'], @@ -1198,6 +1197,7 @@ while ($row = $db->sql_fetchrow($result)) 'username' => $row['username'], 'user_colour' => $row['user_colour'], + 'contact_user' => $user->lang('CONTACT_USER', $row['username']), 'online' => false, 'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '', @@ -1699,7 +1699,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'], 'POSTER_WARNINGS' => $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '', 'POSTER_AGE' => $user_cache[$poster_id]['age'], - 'CONTACT_USER' => $row['contact_user'], + 'CONTACT_USER' => $user_cache_data['contact_user'], 'POST_DATE' => $user->format_date($row['post_time'], false, ($view == 'print') ? true : false), 'POST_SUBJECT' => $row['post_subject'], |