mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
- do not cache the activity queries, this is only a lot of overhead (haven't noticed the forums also get included)
- back to our known poster name display on viewtopic/topic review. :) git-svn-id: file:///svn/phpbb/trunk@6599 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
c2191ae9cc
commit
40f0a1ea15
5 changed files with 10 additions and 7 deletions
|
@ -1047,7 +1047,7 @@ function display_user_activity(&$userdata)
|
||||||
$forum_sql
|
$forum_sql
|
||||||
GROUP BY forum_id
|
GROUP BY forum_id
|
||||||
ORDER BY num_posts DESC";
|
ORDER BY num_posts DESC";
|
||||||
$result = $db->sql_query_limit($sql, 1, 0, 3600);
|
$result = $db->sql_query_limit($sql, 1);
|
||||||
$active_f_row = $db->sql_fetchrow($result);
|
$active_f_row = $db->sql_fetchrow($result);
|
||||||
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
||||||
|
|
||||||
|
@ -1069,7 +1069,7 @@ function display_user_activity(&$userdata)
|
||||||
$forum_sql
|
$forum_sql
|
||||||
GROUP BY topic_id
|
GROUP BY topic_id
|
||||||
ORDER BY num_posts DESC";
|
ORDER BY num_posts DESC";
|
||||||
$result = $db->sql_query_limit($sql, 1, 0, 3600);
|
$result = $db->sql_query_limit($sql, 1);
|
||||||
$active_t_row = $db->sql_fetchrow($result);
|
$active_t_row = $db->sql_fetchrow($result);
|
||||||
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
<!-- IF U_NOTES or U_WARN -->
|
<!-- IF U_NOTES or U_WARN -->
|
||||||
<tr>
|
<tr>
|
||||||
<td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td>
|
<td class="gen" align="right" valign="top" nowrap="nowrap">{L_WARNINGS}: </td>
|
||||||
<td width="100%"><b class="gen">{WARNINGS}</b><br /><span class="genmed">[ <a href="{U_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_WARN --> | <a href="{U_WARN}">{L_WARN_USER}</a> <!-- ENDIF -->]</td>
|
<td width="100%"><b class="gen">{WARNINGS}</b><br /><span class="genmed">[ <a href="{U_NOTES}">{L_VIEW_NOTES}</a> <!-- IF U_WARN --> | <a href="{U_WARN}">{L_WARN_USER}</a> <!-- ENDIF -->]</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<!-- ENDIF -->
|
<!-- ENDIF -->
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -195,6 +195,7 @@ function checkForm()
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row1"><b class="genmed">{L_TO}:</b></td>
|
<td class="row1"><b class="genmed">{L_TO}:</b></td>
|
||||||
<td class="row2">
|
<td class="row2">
|
||||||
|
{S_HIDDEN_ADDRESS_FIELD}
|
||||||
<!-- BEGIN to_recipient -->
|
<!-- BEGIN to_recipient -->
|
||||||
<span class="genmed">
|
<span class="genmed">
|
||||||
<a href="{to_recipient.U_VIEW}"<!-- IF to_recipient.COLOUR --> style="color:#{to_recipient.COLOUR}"<!-- ELSEIF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><b>{to_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="{L_REMOVE}" /> <!-- ENDIF -->
|
<a href="{to_recipient.U_VIEW}"<!-- IF to_recipient.COLOUR --> style="color:#{to_recipient.COLOUR}"<!-- ELSEIF to_recipient.IS_GROUP --> class="blue"<!-- ENDIF -->><b>{to_recipient.NAME}</b></a> </span><!-- IF not S_EDIT_POST --><input class="post" type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="{L_REMOVE}" /> <!-- ENDIF -->
|
||||||
|
@ -214,7 +215,6 @@ function checkForm()
|
||||||
<!-- END bcc_recipient -->
|
<!-- END bcc_recipient -->
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{S_HIDDEN_ADDRESS_FIELD}
|
|
||||||
<!-- ENDIF -->
|
<!-- ENDIF -->
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -15,10 +15,10 @@
|
||||||
|
|
||||||
<!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
|
<!-- IF topic_review_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
|
||||||
|
|
||||||
<td rowspan="2" align="left" valign="top"><a id="{topic_review_row.U_POST_ID}"></a>
|
<td rowspan="2" align="left" valign="top"><a id="pr{topic_review_row.U_POST_ID}"></a>
|
||||||
<table width="150" cellspacing="0">
|
<table width="150" cellspacing="0">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center"><b class="postauthor">{topic_review_row.POST_AUTHOR_FULL}</b></td>
|
<td align="center"><b class="postauthor"<!-- IF topic_review_row.POST_AUTHOR_COLOUR --> style="color: {topic_rewview_row.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{topic_review_row.POST_AUTHOR}</b></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -133,7 +133,10 @@
|
||||||
<td class="gensmall" colspan="2" height="25" align="center"><!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a>{postrow.L_IGNORE_POST}</td>
|
<td class="gensmall" colspan="2" height="25" align="center"><!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a>{postrow.L_IGNORE_POST}</td>
|
||||||
<!-- ELSE -->
|
<!-- ELSE -->
|
||||||
|
|
||||||
<td align="center" valign="middle"><!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a><b class="postauthor">{postrow.POST_AUTHOR_FULL}</b></td>
|
<td align="center" valign="middle">
|
||||||
|
<!-- IF postrow.S_FIRST_UNREAD --><a name="unread"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a>
|
||||||
|
<b class="postauthor"<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</b>
|
||||||
|
</td>
|
||||||
<td width="100%" height="25">
|
<td width="100%" height="25">
|
||||||
<table width="100%" cellspacing="0">
|
<table width="100%" cellspacing="0">
|
||||||
<tr>
|
<tr>
|
||||||
|
|
Loading…
Add table
Reference in a new issue