mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-20 22:37:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1316 from Alkarex/initial-requests

Browse Source 
Remove superflous SQL category request
This commit is contained in:
Alexandre Alapetite
2016-10-15 15:13:38 +02:00
committed by GitHub
parent 98a0389262 4d9fbb97c8
commit 9ed59ff1f3
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -33,8 +33,10 @@
* UI
* Download icon 💾 for podcasts [#1236](https://github.com/FreshRSS/FreshRSS/issues/1236)
* Extensions
* Allow extensions for default accout in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
* Allow extensions for default account in anonymous mode [#1288](https://github.com/FreshRSS/FreshRSS/pull/1288)
* Trigger a `freshrss:load-more` JavaScript event to help extensions [#1278](https://github.com/FreshRSS/FreshRSS/issues/1278)
* SQL
* Increase performances by removing a superfluous category request [#1316](https://github.com/FreshRSS/FreshRSS/pull/1316)
* Mics.
* Removed *resource-priorities* attributes (`defer`, `lazyload`), deprecated by W3C [#1222](https://github.com/FreshRSS/FreshRSS/pull/1222)

5
app/Controllers/indexController.php
View File

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

15
app/Models/Context.php
View File

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