From f1f9b2f5ff60f6dca05fad831b766ea7d63ff3a3 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 22 Oct 2014 13:52:20 +0200 Subject: Entries are loaded again! It's working :) See https://github.com/marienfressinaud/FreshRSS/issues/634 --- app/Models/Context.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'app/Models/Context.php') diff --git a/app/Models/Context.php b/app/Models/Context.php index 31ac60207..54fb1e64a 100644 --- a/app/Models/Context.php +++ b/app/Models/Context.php @@ -28,7 +28,8 @@ class FreshRSS_Context { public static $order = 'DESC'; public static $number = 0; public static $search = ''; - public static $first_id = 0; + public static $first_id = ''; + public static $next_id = ''; public static function init() { // Init configuration. @@ -127,15 +128,23 @@ class FreshRSS_Context { } } - public static function currentGet() { + public static function currentGet($array = false) { if (self::$current_get['all']) { return 'a'; } elseif (self::$current_get['starred']) { return 's'; } elseif (self::$current_get['feed']) { - return 'f_' . self::$current_get['feed']; + if ($array) { + return array('f', self::$current_get['feed']); + } else { + return 'f_' . self::$current_get['feed']; + } } elseif (self::$current_get['category']) { - return 'c_' . self::$current_get['category']; + if ($array) { + return array('c', self::$current_get['category']); + } else { + return 'c_' . self::$current_get['category']; + } } } -- cgit v1.2.3