Browse Source

PSHB bugs

Introduced by https://github.com/FreshRSS/FreshRSS/pull/1280
Alexandre Alapetite 9 years ago
parent
commit
ca4dcca5b2
2 changed files with 3 additions and 1 deletions
  1. 2 1
      app/Controllers/feedController.php
  2. 1 0
      p/api/pshb.php

+ 2 - 1
app/Controllers/feedController.php

@@ -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 - 0
p/api/pshb.php

@@ -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) {