mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2019-12-30 08:37:14 +01:00
commit 5ffb6b34fc
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/mcp/mcp_topic.php
View File

@ -242,7 +242,7 @@ function mcp_topic_view($id, $mode, $action)
); );
extract($phpbb_dispatcher->trigger_event('core.mcp_topic_modify_post_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.mcp_topic_modify_post_data', compact($vars)));
foreach ($rowset as $i => $row) foreach ($rowset as $current_row_number => $row)
{ {
$message = $row['post_text']; $message = $row['post_text'];
$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title']; $post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
@ -336,7 +336,7 @@ function mcp_topic_view($id, $mode, $action)
} }
} }
unset($rowset[$i]); unset($rowset[$current_row_number]);
} }
// Display topic icons for split topic // Display topic icons for split topic

2
phpBB/phpbb/search/fulltext_native.php
View File

@ -788,6 +788,8 @@ class fulltext_native extends \phpbb\search\base
$must_not_contain_ids = $this->must_not_contain_ids; $must_not_contain_ids = $this->must_not_contain_ids;
$must_contain_ids = $this->must_contain_ids; $must_contain_ids = $this->must_contain_ids;
$sql_sort_table = $sql_sort_join = $sql_match = $sql_match_where = $sql_sort = '';
/** /**
* Allow changing the query used for counting for posts using fulltext_native * Allow changing the query used for counting for posts using fulltext_native
* *

4
phpBB/search.php
View File

@ -1214,6 +1214,10 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'U_VIEW_POST' => (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=" . $row['topic_id'] . '&p=' . $row['post_id'] . (($u_hilit) ? '&hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '', 'U_VIEW_POST' => (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=" . $row['topic_id'] . '&p=' . $row['post_id'] . (($u_hilit) ? '&hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '',
)); ));
$folder_img = $folder_alt = $u_mcp_queue = '';
$topic_type = $posts_unapproved = 0;
$unread_topic = $topic_unapproved = $topic_deleted = false;
/** /**
* Modify the topic data before it is assigned to the template * Modify the topic data before it is assigned to the template
* *