mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-06 22:23:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

PSHB bugs

Browse Source 
Introduced by https://github.com/FreshRSS/FreshRSS/pull/1280
This commit is contained in:
Alexandre Alapetite
2016-10-07 21:46:48 +02:00
parent a0d502a763
commit ca4dcca5b2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/feedController.php
View File

@@ -271,7 +271,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
if ($ttl == -1) {
continue; //Feed refresh is disabled
}
if ($feed->lastUpdate() + 10 >= time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) {
if ((!$simplePiePush) && (!$feed_id) &&
($feed->lastUpdate() + 10 >= time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl))) {
//Too early to refresh from source, but check whether the feed was updated by another user
$mtime = $feed->cacheModifiedTime();
if ($feed->lastUpdate() + 10 >= $mtime) {

1
p/api/pshb.php
View File

@@ -116,6 +116,7 @@ foreach ($users as $userFilename) {
Minz_Configuration::register('user',
join_path(USERS_PATH, $username, 'config.php'),
join_path(USERS_PATH, '_', 'config.default.php'));
new Minz_ModelPdo($username); //TODO: FIXME: Quick-fix while waiting for a better FreshRSS() constructor/init
FreshRSS_Context::init();
list($updated_feeds, $feed) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie);
if ($updated_feeds > 0) {