mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/nickvergessen/9684' into develop

Browse Source 
* ticket/nickvergessen/9684:
  [ticket/9684] Also display forum-name in subsilver2 template
  [ticket/9684] Move currently existing GAs to a selectable forum while updating.
  [ticket/9684] View origin-forumname for GAs in topic-list
  [ticket/9684] Fix Forum/Topic-Tracking for global announcements
  [ticket/9684] Fix a SQL-Error in the posting.php
  [ticket/9684] Remove code in some more files especially includes/
  [ticket/9684] Remove code for global announcement in root-files
This commit is contained in:
Oleg Pudeyev
2011-04-11 00:04:19 -04:00
parent 00a69b4372 ad81637300
commit 716f514ee9
26 changed files with 395 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/acp/acp_search.php
View File

@@ -397,9 +397,8 @@ class acp_search
$i = 0;
while ($row = ($buffer ? $rows[$i++] : $db->sql_fetchrow($result)))
{
// Indexing enabled for this forum or global announcement?
// Global announcements get indexed by default.
if (!$row['forum_id'] || (isset($forums[$row['forum_id']]) && $forums[$row['forum_id']]))
// Indexing enabled for this forum
if (isset($forums[$row['forum_id']]) && $forums[$row['forum_id']])
{
$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
}