2 files changed, 78 insertions, 62 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php
index f9e6146327..1ca7768dfb 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -336,68 +336,6 @@ function feed_generate_content($content, $uid, $bitfield, $options)
 }
 
 /**
-* 'All Forums' feed
-*
-* This will give you a list of all postable forums where feeds are enabled
-* including forum description, topic stats and post stats
-*
-* @package phpBB3
-*/
-class phpbb_feed_forums extends phpbb_feed_base
-{
-	var $num_items	= 0;
-
-	function set_keys()
-	{
-		$this->set('title',		'forum_name');
-		$this->set('text',		'forum_desc');
-		$this->set('bitfield',	'forum_desc_bitfield');
-		$this->set('bbcode_uid','forum_desc_uid');
-		$this->set('updated',	'forum_last_post_time');
-		$this->set('options',	'forum_desc_options');
-	}
-
-	function get_sql()
-	{
-		global $auth, $db;
-
-		$in_fid_ary = array_diff($this->get_readable_forums(), $this->get_excluded_forums());
-		if (empty($in_fid_ary))
-		{
-			return false;
-		}
-
-		// Build SQL Query
-		$this->sql = array(
-			'SELECT'	=> 'f.forum_id, f.left_id, f.forum_name, f.forum_last_post_time,
-							f.forum_desc, f.forum_desc_bitfield, f.forum_desc_uid, f.forum_desc_options,
-							f.forum_topics, f.forum_posts',
-			'FROM'		=> array(FORUMS_TABLE => 'f'),
-			'WHERE'		=> 'f.forum_type = ' . FORUM_POST . '
-							AND ' . $db->sql_in_set('f.forum_id', $in_fid_ary),
-			'ORDER_BY'	=> 'f.left_id ASC',
-		);
-
-		return true;
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		global $phpEx, $config;
-
-		$item_row['link'] = feed_append_sid('/viewforum.' . $phpEx, 'f=' . $row['forum_id']);
-
-		if ($config['feed_item_statistics'])
-		{
-			global $user;
-
-			$item_row['statistics'] = $user->lang('TOTAL_TOPICS', (int) $row['forum_topics'])
-				. ' ' . $this->separator_stats . ' ' . $user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts']);
-		}
-	}
-}
-
-/**
 * News feed
 *
 * This will give you {$this->num_items} first posts
diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php
new file mode 100644
index 0000000000..f1c3e3531f
--- /dev/null
+++ b/phpBB/includes/feed/forums.php
@@ -0,0 +1,78 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* 'All Forums' feed
+*
+* This will give you a list of all postable forums where feeds are enabled
+* including forum description, topic stats and post stats
+*
+* @package phpBB3
+*/
+class phpbb_feed_forums extends phpbb_feed_base
+{
+	var $num_items	= 0;
+
+	function set_keys()
+	{
+		$this->set('title',		'forum_name');
+		$this->set('text',		'forum_desc');
+		$this->set('bitfield',	'forum_desc_bitfield');
+		$this->set('bbcode_uid','forum_desc_uid');
+		$this->set('updated',	'forum_last_post_time');
+		$this->set('options',	'forum_desc_options');
+	}
+
+	function get_sql()
+	{
+		global $auth, $db;
+
+		$in_fid_ary = array_diff($this->get_readable_forums(), $this->get_excluded_forums());
+		if (empty($in_fid_ary))
+		{
+			return false;
+		}
+
+		// Build SQL Query
+		$this->sql = array(
+			'SELECT'	=> 'f.forum_id, f.left_id, f.forum_name, f.forum_last_post_time,
+							f.forum_desc, f.forum_desc_bitfield, f.forum_desc_uid, f.forum_desc_options,
+							f.forum_topics, f.forum_posts',
+			'FROM'		=> array(FORUMS_TABLE => 'f'),
+			'WHERE'		=> 'f.forum_type = ' . FORUM_POST . '
+							AND ' . $db->sql_in_set('f.forum_id', $in_fid_ary),
+			'ORDER_BY'	=> 'f.left_id ASC',
+		);
+
+		return true;
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		global $phpEx, $config;
+
+		$item_row['link'] = feed_append_sid('/viewforum.' . $phpEx, 'f=' . $row['forum_id']);
+
+		if ($config['feed_item_statistics'])
+		{
+			global $user;
+
+			$item_row['statistics'] = $user->lang('TOTAL_TOPICS', (int) $row['forum_topics'])
+				. ' ' . $this->separator_stats . ' ' . $user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts']);
+		}
+	}
+}