diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-01 16:25:11 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-01 16:25:11 +0100 |
| commit | 7a294b5fcd7e38beb52bf3f899b483da476c0c59 (patch) | |
| tree | b041da9356196c58b391ac836d50b34d1554c147 /phpBB | |
| parent | 6ee537b3f2f45b300e38a55759566abb0752ec0f (diff) | |
| parent | a3276c3ffecb677dd9104f65a88bfbf1a368ead1 (diff) | |
| download | forums-7a294b5fcd7e38beb52bf3f899b483da476c0c59.tar forums-7a294b5fcd7e38beb52bf3f899b483da476c0c59.tar.gz forums-7a294b5fcd7e38beb52bf3f899b483da476c0c59.tar.bz2 forums-7a294b5fcd7e38beb52bf3f899b483da476c0c59.tar.xz forums-7a294b5fcd7e38beb52bf3f899b483da476c0c59.zip | |
Merge pull request #5795 from 3D-I/ticket/16274
[ticket/16274] Fix compact() call to undefined variables in search.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/feed/controller/feed.php | 7 | ||||
| -rw-r--r-- | phpBB/search.php | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php index c0d7bc72ec..7826d19042 100644 --- a/phpBB/phpbb/feed/controller/feed.php +++ b/phpBB/phpbb/feed/controller/feed.php @@ -308,14 +308,13 @@ class feed * Event to modify the feed row * * @event core.feed_modify_feed_row - * @var int forum_id Forum ID - * @var string mode Feeds mode (forums|topics|topics_new|topics_active|news) + * @var feed_interface feed Feed instance * @var array row Array with feed data - * @var int topic_id Topic ID * * @since 3.1.10-RC1 + * @changed 3.3.0 Replace forum_id, mode, topic_id with feed instance */ - $vars = array('forum_id', 'mode', 'row', 'topic_id'); + $vars = array('feed', 'row'); extract($this->phpbb_dispatcher->trigger_event('core.feed_modify_feed_row', compact($vars))); // BBCode options to correctly disable urls, smilies, bbcode... diff --git a/phpBB/search.php b/phpBB/search.php index e50df13ea4..5d5e9f5f8a 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1079,6 +1079,10 @@ if ($keywords || $author || $author_id || $search_id || $submit) $view_topic_url_params = "f=$forum_id&t=$result_topic_id" . (($u_hilit) ? "&hilit=$u_hilit" : ''); $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params); + $folder_img = $folder_alt = $u_mcp_queue = ''; + $topic_type = $posts_unapproved = 0; + $unread_topic = $topic_unapproved = $topic_deleted = false; + if ($show_results == 'topics') { if ($config['load_db_track'] && $author_id === $user->data['user_id']) @@ -1086,7 +1090,6 @@ if ($keywords || $author || $author_id || $search_id || $submit) $row['topic_posted'] = 1; } - $folder_img = $folder_alt = $topic_type = ''; topic_status($row, $replies, (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false, $folder_img, $folder_alt, $topic_type); $unread_topic = (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false; @@ -1214,10 +1217,6 @@ 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 * |