From a3276c3ffecb677dd9104f65a88bfbf1a368ead1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 30 Dec 2019 11:46:19 +0100
Subject: [ticket/16274] Fix feed event referring to undefined variables

PHPBB3-16274
---
 phpBB/phpbb/feed/controller/feed.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/feed/controller/feed.php')

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...
-- 
cgit v1.2.1

/option>
<option value='distro/mdv2009.1'>distro/mdv2009.1</option>
<option value='distro/mdv2010.0'>distro/mdv2010.0</option>
<option value='distro/mes5'>distro/mes5</option>
<option value='distro/mes5-2.6.33'>distro/mes5-2.6.33</option>
<option value='distro/mes6'>distro/mes6</option>
<option value='distro/mga1'>distro/mga1</option>
<option value='distro/mga2'>distro/mga2</option>
<option value='distro/mga3'>distro/mga3</option>
<option value='master'>master</option>
<option value='topic/Corpo_2_1'>topic/Corpo_2_1</option>
<option value='topic/KA9_0'>topic/KA9_0</option>
<option value='topic/MDK-10-update'>topic/MDK-10-update</option>
<option value='topic/MDK-10_1-update'>topic/MDK-10_1-update</option>
<option value='topic/MDK-10_2-update'>topic/MDK-10_2-update</option>
<option value='topic/MDK-2006_0-update'>topic/MDK-2006_0-update</option>
<option value='topic/MDK92-branch'>topic/MDK92-branch</option>
<option value='topic/MDKC_1_0'>topic/MDKC_1_0</option>
<option value='topic/PCMCIA_CS_DISTRO'>topic/PCMCIA_CS_DISTRO</option>
<option value='topic/R9_0-64bit-branch'>topic/R9_0-64bit-branch</option>
<option value='topic/R9_1_HP-branch'>topic/R9_1_HP-branch</option>
<option value='topic/a'>topic/a</option>
<option value='topic/before_matchbox_wm'>topic/before_matchbox_wm</option>
<option value='topic/dietlibc'>topic/dietlibc</option>
<option value='topic/firewall'>topic/firewall</option>
<option value='topic/gdk-pixbuf-0-branch'>topic/gdk-pixbuf-0-branch</option>
<option value='topic/gi-ppc'>topic/gi-ppc</option>
<option value='topic/ia64-8_1'>topic/ia64-8_1</option>
<option value='topic/mandrakesoft'>topic/mandrakesoft</option>
<option value='topic/mlcd4'>topic/mlcd4</option>
<option value='topic/ppp'>topic/ppp</option>
<option value='topic/rp-pppoe'>topic/rp-pppoe</option>
<option value='topic/switching_to_urpmi'>topic/switching_to_urpmi</option>
<option value='topic/unlabeled-1.1.1'>topic/unlabeled-1.1.1</option>
<option value='topic/v_webmin_0_87'>topic/v_webmin_0_87</option>
<option value='topic/x86_64-branch'>topic/x86_64-branch</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mageia Installer and base platform for many utilities</td><td class='sub right'>Thierry Vignaud [tv]</td></tr></table>
<table class='tabs'><tr><td>
<a href='/software/drakx-backup-do-not-use/?h=V9_2_11mdk'>summary</a><a href='/software/drakx-backup-do-not-use/refs/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>refs</a><a href='/software/drakx-backup-do-not-use/log/?h=V9_2_11mdk'>log</a><a href='/software/drakx-backup-do-not-use/tree/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>tree</a><a class='active' href='/software/drakx-backup-do-not-use/commit/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>commit</a><a href='/software/drakx-backup-do-not-use/diff/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>diff</a><a href='/software/drakx-backup-do-not-use/stats/?h=V9_2_11mdk'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakx-backup-do-not-use/log/'>
<input type='hidden' name='h' value='V9_2_11mdk'/><input type='hidden' name='id' value='d4d32aca0c6dba5ec706f3ba8689a8c683082a61'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='V9_2_11mdk'/><input type='hidden' name='id' value='d4d32aca0c6dba5ec706f3ba8689a8c683082a61'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2003-09-12 00:41:20 +0000</td></tr>
<tr><th>committer</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2003-09-12 00:41:20 +0000</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/commit/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>d4d32aca0c6dba5ec706f3ba8689a8c683082a61</a> (<a href='/software/drakx-backup-do-not-use/patch/?id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/tree/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>99fde4ca6e8a11f8560c73facf40b1214646956c</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/commit/?h=V9_2_11mdk&amp;id=bb623dd9f2a8c9f45f80c763b6f52df98b64c5b5'>bb623dd9f2a8c9f45f80c763b6f52df98b64c5b5</a> (<a href='/software/drakx-backup-do-not-use/diff/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61&amp;id2=bb623dd9f2a8c9f45f80c763b6f52df98b64c5b5'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar'>drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar.gz'>drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar.gz</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar.bz2'>drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar.bz2</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar.xz'>drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.tar.xz</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.zip'>drakx-backup-do-not-use-d4d32aca0c6dba5ec706f3ba8689a8c683082a61.zip</a><br/></td></tr></table>
<div class='commit-subject'>updated pot file</div><div class='commit-msg'></div><div class='diffstat-header'><a href='/software/drakx-backup-do-not-use/diff/?h=V9_2_11mdk&amp;id=d4d32aca0c6dba5ec706f3ba8689a8c683082a61'>Diffstat</a></div><table summary='diffstat' class='diffstat'>