mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

[ticket/8309] Removing key with similar function to avoid redundancy

Browse Source 
PHPBB3-8309
This commit is contained in:
geetakshi 2014-03-17 21:08:03 +05:30
parent 6a1967514d
commit 66ed9881df
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_main.php
View File

@ -189,7 +189,7 @@ class ucp_main
$template->assign_vars(array( $template->assign_vars(array(
'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '',
'JOINED' => $user->format_date($user->data['user_regdate']), 'JOINED' => $user->format_date($user->data['user_regdate']),
'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0,
'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0,
'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day), 'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day),

1
phpBB/language/en/memberlist.php
View File

@ -85,7 +85,6 @@ $lang = array_merge($lang, array(
'IM_USER' => 'Send an instant message', 'IM_USER' => 'Send an instant message',
'LAST_ACTIVE' => 'Last active', 'LAST_ACTIVE' => 'Last active',
'LAST_ACTIVITY' => 'Last activity',
'LESS_THAN' => 'Less than', 'LESS_THAN' => 'Less than',
'LIST_USERS' => array( 'LIST_USERS' => array(
1 => '%d user', 1 => '%d user',

2
phpBB/memberlist.php
View File

@ -1703,7 +1703,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
'AGE' => $age, 'AGE' => $age,
'RANK_TITLE' => $rank_title, 'RANK_TITLE' => $rank_title,
'JOINED' => $user->format_date($data['user_regdate']), 'JOINED' => $user->format_date($data['user_regdate']),
'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity),
'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0,
'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0, 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0,

2
phpBB/styles/prosilver/template/memberlist_body.html
View File

@ -113,7 +113,7 @@
<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td> <td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE -->&nbsp;<!-- END custom_fields --></td> <td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE -->&nbsp;<!-- END custom_fields --></td>
<td>{memberrow.JOINED}</td> <td>{memberrow.JOINED}</td>
<!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVITY}&nbsp;</td><!-- ENDIF --> <!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVE}&nbsp;</td><!-- ENDIF -->
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr class="bg1"> <tr class="bg1">

2
phpBB/styles/prosilver/template/memberlist_view.html
View File

@ -85,7 +85,7 @@
<dl class="details"> <dl class="details">
<!-- EVENT memberlist_view_user_statistics_before --> <!-- EVENT memberlist_view_user_statistics_before -->
<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> <dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
<dt>{L_LAST_ACTIVITY}{L_COLON}</dt> <dd>{LAST_ACTIVITY}</dd> <dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_ACTIVE}</dd>
<!-- IF S_WARNINGS --> <!-- IF S_WARNINGS -->
<dt>{L_WARNINGS}{L_COLON} </dt> <dt>{L_WARNINGS}{L_COLON} </dt>
<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd> <dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>

2
phpBB/styles/prosilver/template/ucp_main_front.html
View File

@ -60,7 +60,7 @@
<dl class="details"> <dl class="details">
<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd> <dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
<dt>{L_LAST_ACTIVITY}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd> <dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd>
<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd> <dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF --> <!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF --> <!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->

4
phpBB/styles/subsilver2/template/memberlist_view.html
View File

@ -72,8 +72,8 @@
<td width="100%"><b class="gen">{JOINED}</b></td> <td width="100%"><b class="gen">{JOINED}</b></td>
</tr> </tr>
<tr> <tr>
<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LAST_ACTIVITY}{L_COLON} </td> <td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{L_LAST_ACTIVE}{L_COLON} </td>
<td width="100%"><b class="gen">{LAST_ACTIVITY}</b></td> <td width="100%"><b class="gen">{LAST_ACTIVE}</b></td>
</tr> </tr>
<!-- IF S_WARNINGS --> <!-- IF S_WARNINGS -->
<tr> <tr>