Remove superflous category request

A category request was systematically done, although it is not always
needed.
pull/1316/head
Alexandre Alapetite 8 years ago
parent 98a0389262
commit 56f66f4b61
  1. 5
      app/Controllers/indexController.php
  2. 15
      app/Models/Context.php

@ -159,6 +159,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
* - hours (default: 0) * - hours (default: 0)
*/ */
private function updateContext() { private function updateContext() {
if (empty(FreshRSS_Context::$categories)) {
$catDAO = new FreshRSS_CategoryDAO();
FreshRSS_Context::$categories = $catDAO->listCategories();
}
// Update number of read / unread variables. // Update number of read / unread variables.
$entryDAO = FreshRSS_Factory::createEntryDao(); $entryDAO = FreshRSS_Factory::createEntryDao();
FreshRSS_Context::$total_starred = $entryDAO->countUnreadReadFavorites(); FreshRSS_Context::$total_starred = $entryDAO->countUnreadReadFavorites();

@ -48,9 +48,6 @@ class FreshRSS_Context {
// Init configuration. // Init configuration.
self::$system_conf = Minz_Configuration::get('system'); self::$system_conf = Minz_Configuration::get('system');
self::$user_conf = Minz_Configuration::get('user'); self::$user_conf = Minz_Configuration::get('user');
$catDAO = new FreshRSS_CategoryDAO();
self::$categories = $catDAO->listCategories();
} }
/** /**
@ -142,6 +139,11 @@ class FreshRSS_Context {
$id = substr($get, 2); $id = substr($get, 2);
$nb_unread = 0; $nb_unread = 0;
if (empty(self::$categories)) {
$catDAO = new FreshRSS_CategoryDAO();
self::$categories = $catDAO->listCategories();
}
switch($type) { switch($type) {
case 'a': case 'a':
self::$current_get['all'] = true; self::$current_get['all'] = true;
@ -203,11 +205,16 @@ class FreshRSS_Context {
/** /**
* Set the value of $next_get attribute. * Set the value of $next_get attribute.
*/ */
public static function _nextGet() { private static function _nextGet() {
$get = self::currentGet(); $get = self::currentGet();
// By default, $next_get == $get // By default, $next_get == $get
self::$next_get = $get; self::$next_get = $get;
if (empty(self::$categories)) {
$catDAO = new FreshRSS_CategoryDAO();
self::$categories = $catDAO->listCategories();
}
if (self::$user_conf->onread_jump_next && strlen($get) > 2) { if (self::$user_conf->onread_jump_next && strlen($get) > 2) {
$another_unread_id = ''; $another_unread_id = '';
$found_current_get = false; $found_current_get = false;

Loading…
Cancel
Save