makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12680] Little changes, but some issues are still there

Browse source 
PHPBB3-12680
This commit is contained in:
Crizzo 2014-06-14 15:57:20 +02:00
parent af60861cfd
commit 8a5cb4a026
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -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_AVATAR' => (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']), 'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']),
'AUTHOR_POSTS' => (int) $user_info['user_posts'], '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'])), '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), 'S_ONLINE' => (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),

4
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View file

@ -38,7 +38,7 @@
<dd class="profile-contact"> <dd class="profile-contact">
<strong>{L_CONTACT}{L_COLON}</strong> <strong>{L_CONTACT}{L_COLON}</strong>
<div class="dropdown-container dropdown-left"> <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="dropdown hidden">
<div class="pointer"><div class="pointer-inner"></div></div> <div class="pointer"><div class="pointer-inner"></div></div>
<div class="dropdown-contents contact-icons"> <div class="dropdown-contents contact-icons">
@ -49,7 +49,7 @@
<div> <div>
<!-- ENDIF --> <!-- 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 -->> <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> </a>
<!-- IF REMAINDER eq 3 or contact.S_LAST_ROW --> <!-- IF REMAINDER eq 3 or contact.S_LAST_ROW -->
</div> </div>

4
phpBB/viewtopic.php
View file

@ -1061,7 +1061,6 @@ while ($row = $db->sql_fetchrow($result))
'post_time' => $row['post_time'], 'post_time' => $row['post_time'],
'user_id' => $row['user_id'], 'user_id' => $row['user_id'],
'username' => $row['username'], 'username' => $row['username'],
'contact_user' => $user->lang('CONTACT_USER', $row['username']),
'user_colour' => $row['user_colour'], 'user_colour' => $row['user_colour'],
'topic_id' => $row['topic_id'], 'topic_id' => $row['topic_id'],
'forum_id' => $row['forum_id'], 'forum_id' => $row['forum_id'],
@ -1198,6 +1197,7 @@ while ($row = $db->sql_fetchrow($result))
'username' => $row['username'], 'username' => $row['username'],
'user_colour' => $row['user_colour'], 'user_colour' => $row['user_colour'],
'contact_user' => $user->lang('CONTACT_USER', $row['username']),
'online' => false, 'online' => false,
'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") : '', '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") : '',
@ -1699,7 +1699,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'], 'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'],
'POSTER_WARNINGS' => $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '', 'POSTER_WARNINGS' => $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '',
'POSTER_AGE' => $user_cache[$poster_id]['age'], '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_DATE' => $user->format_date($row['post_time'], false, ($view == 'print') ? true : false),
'POST_SUBJECT' => $row['post_subject'], 'POST_SUBJECT' => $row['post_subject'],