diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-12-30 08:37:08 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-30 08:37:08 +0100 |
| commit | b1c5ad6a6109acfdb82c3705e67d9e4241c088ff (patch) | |
| tree | 1d3424eb56994602a22edd6311eff4a5e311c8da | |
| parent | 036871cd9535503f1f7456096e6368544bdd8fc5 (diff) | |
| parent | 202478d1088def6e73fd0a9abc0bf951b7b13132 (diff) | |
| download | forums-b1c5ad6a6109acfdb82c3705e67d9e4241c088ff.tar forums-b1c5ad6a6109acfdb82c3705e67d9e4241c088ff.tar.gz forums-b1c5ad6a6109acfdb82c3705e67d9e4241c088ff.tar.bz2 forums-b1c5ad6a6109acfdb82c3705e67d9e4241c088ff.tar.xz forums-b1c5ad6a6109acfdb82c3705e67d9e4241c088ff.zip | |
Merge pull request #5783 from brunoais/ticket/16262
Ticket/16262 compact() calls with undefined variables causing error page
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_native.php | 2 | ||||
| -rw-r--r-- | phpBB/search.php | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 83ad56f3e4..77db5f3ed0 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -242,7 +242,7 @@ function mcp_topic_view($id, $mode, $action) ); 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']; $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 diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 63ac242ea2..23460d3381 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -788,6 +788,8 @@ class fulltext_native extends \phpbb\search\base $must_not_contain_ids = $this->must_not_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 * diff --git a/phpBB/search.php b/phpBB/search.php index bd8025dae5..e50df13ea4 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -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'] : '', )); + $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 * |