basically reversing commit 18176083

2 files changed, 2 insertions, 20 deletions

diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index cee670063..7d14afe45 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -27,7 +27,7 @@
 		}
 		echo '</ul></li></ul>';
 	}
-	include("populateroot.php");
+
 	include("part.itemcounter.php");
-	print_folder($allfeeds, 0);
+	print_folder($_['allfeeds'], 0);
 ?>
\ No newline at end of file
diff --git a/templates/populateroot.php b/templates/populateroot.php
deleted file mode 100644
index a408c25ec..000000000
--- a/templates/populateroot.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('news');
-
-$foldermapper = new OC_News_FolderMapper(OCP\USER::getUser());
-
-$allfeeds = $foldermapper->populate('Everything', 0);
-
-if ($allfeeds) {
-	$feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null;
-	if ($feedid == null) {
-
-	}
-}
-else {
-	$feedid = 0;
-}