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

- Bug 1104: fixed a typo ($necoding => $encoding)

Browse source 
- Bug 1139: active_topics now has a button to submit the "Display posts from previous <time>" form
- active_topics doesn't return NULL rows anymore
- fix a padding bug in the search forum listing


git-svn-id: file:///svn/phpbb/trunk@5674 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-03-19 22:25:43 +00:00
parent 7dda2cd9bf
commit cbbc1d2a45
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_messenger.php
View file

@ -14,7 +14,7 @@
*/ */
class messenger class messenger
{ {
var $vars, $msg, $extra_headers, $replyto, $from, $subject, $necoding; var $vars, $msg, $extra_headers, $replyto, $from, $subject, $encoding;
var $addresses = array(); var $addresses = array();
var $mail_priority = MAIL_NORMAL_PRIORITY; var $mail_priority = MAIL_NORMAL_PRIORITY;

14
phpBB/search.php
View file

@ -263,9 +263,10 @@ if ($keywords || $author || $search_id)
$last_post_time = (time() - ($sort_days * 24 * 3600)); $last_post_time = (time() - ($sort_days * 24 * 3600));
$sql = 'SELECT DISTINCT t.topic_id $sql = 'SELECT DISTINCT t.topic_id
FROM ' . POSTS_TABLE . ' p FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
LEFT JOIN ' . TOPICS_TABLE . " t ON (t.topic_approved = 1 AND p.topic_id = t.topic_id)
WHERE p.post_time > $last_post_time WHERE p.post_time > $last_post_time
AND t.topic_approved = 1
AND p.topic_id = t.topic_id
$m_approve_fid_sql $m_approve_fid_sql
" . ((sizeof($ex_fid_ary)) ? ' AND p.forum_id NOT IN (' . implode(',', $ex_fid_ary) . ')' : '') . ' " . ((sizeof($ex_fid_ary)) ? ' AND p.forum_id NOT IN (' . implode(',', $ex_fid_ary) . ')' : '') . '
ORDER BY t.topic_last_post_time DESC'; ORDER BY t.topic_last_post_time DESC';
@ -736,7 +737,14 @@ while ($row = $db->sql_fetchrow($result))
} }
else if ($row['left_id'] > $right + 1) else if ($row['left_id'] > $right + 1)
{ {
$padding = $pad_store[$row['parent_id']]; if (isset($pad_store[$row['parent_id']]))
{
$padding = $pad_store[$row['parent_id']];
}
else
{
continue;
}
} }
$right = $row['right_id']; $right = $row['right_id'];

2
phpBB/styles/subSilver/template/search_results.html
View file

@ -69,7 +69,7 @@
</tr> </tr>
<!-- END searchresults --> <!-- END searchresults -->
<tr> <tr>
<td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY -->&nbsp;<span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /><!-- ENDIF --></td> <td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY -->&nbsp;<span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}<!-- ENDIF -->&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
</tr> </tr>
</table> </table>