aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-10-08 17:22:46 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-10-08 17:22:46 +0200
commit1f748e5d47f92d90b1c3e52ab8c8bb67322fb190 (patch)
tree606ae41158c64b9ceaffe834c08a9630167b3f91
parentca619cb4a9223876f3b9c512ae987c3de6e820b9 (diff)
parent967bef365688508d2e587b228c1bfdd31a227f37 (diff)
downloadforums-1f748e5d47f92d90b1c3e52ab8c8bb67322fb190.tar
forums-1f748e5d47f92d90b1c3e52ab8c8bb67322fb190.tar.gz
forums-1f748e5d47f92d90b1c3e52ab8c8bb67322fb190.tar.bz2
forums-1f748e5d47f92d90b1c3e52ab8c8bb67322fb190.tar.xz
forums-1f748e5d47f92d90b1c3e52ab8c8bb67322fb190.zip
Merge remote-tracking branch 'EXreaction/ticket/11895' into develop
* EXreaction/ticket/11895: [ticket/11895] Fix undefined $forum_id
-rw-r--r--phpBB/phpbb/feed/forum.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php
index 5f64d85625..83066d2d25 100644
--- a/phpBB/phpbb/feed/forum.php
+++ b/phpBB/phpbb/feed/forum.php
@@ -36,7 +36,7 @@ class forum extends \phpbb\feed\post_base
* @param int $forum_id Forum ID
* @return \phpbb\feed\forum
*/
- public function set_forum_id($topic_id)
+ public function set_forum_id($forum_id)
{
$this->forum_id = (int) $forum_id;