move a bunch of functions into Feeds/Article namespaces

+       static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
+       static function getLastArticleId() {
+       static function queryFeedHeadlines($params) {
+       static function getParentCategories($cat, $owner_uid) {
+       static function getChildCategories($cat, $owner_uid) {

move the rest of functions2.php back to functions.php as it is of more manageable size, remove the former

1 files changed, 2 insertions, 17 deletions

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 0f1ae21eb..ec0c0fc60 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -37,16 +37,6 @@ class Handler_Public extends Handler {
 			break;
 		}
 
-		/*$qfh_ret = queryFeedHeadlines($feed,
-			1, $view_mode, $is_cat, $search, false,
-			$date_sort_field, $offset, $owner_uid,
-			false, 0, true, true, false, false, $start_ts);*/
-
-		//function queryFeedHeadlines($feed,
-		// $limit, $view_mode, $cat_view, $search, $search_mode,
-		// $override_order = false, $offset = 0, $owner_uid = 0,
-		// $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) {
-
 		$params = array(
 			"owner_uid" => $owner_uid,
 			"feed" => $feed,
@@ -61,7 +51,7 @@ class Handler_Public extends Handler {
 			"start_ts" => $start_ts
 		);
 
-		$qfh_ret = queryFeedHeadlines($params);
+		$qfh_ret = Feeds::queryFeedHeadlines($params);
 
 		$result = $qfh_ret[0];
 
@@ -79,11 +69,6 @@ class Handler_Public extends Handler {
 			header("Last-Modified: $last_modified", true);
 		}
 
-		/*$qfh_ret = queryFeedHeadlines($feed,
-			$limit, $view_mode, $is_cat, $search, false,
-			$date_sort_field, $offset, $owner_uid,
-			false, 0, true, true, false, false, $start_ts);*/
-
 		$params = array(
 			"owner_uid" => $owner_uid,
 			"feed" => $feed,
@@ -98,7 +83,7 @@ class Handler_Public extends Handler {
 			"start_ts" => $start_ts
 		);
 
-		$qfh_ret = queryFeedHeadlines($params);
+		$qfh_ret = Feeds::queryFeedHeadlines($params);
 
 		$result = $qfh_ret[0];
 		$feed_title = htmlspecialchars($qfh_ret[1]);