Pārlūkot izejas kodu

Fix feed update with MySQL/MariaDB

- updateFeed() returns 0 if nothing changes so the test was false.
- Redirection in case of error is better now by redirecting on the right feed

Fix https://github.com/FreshRSS/FreshRSS/issues/755
Marien Fressinaud 11 gadi atpakaļ
vecāks
revīzija
517d5aa9c5
1 mainītis faili ar 4 papildinājumiem un 3 dzēšanām
  1. 4 3
      app/Controllers/subscriptionController.php

+ 4 - 3
app/Controllers/subscriptionController.php

@@ -102,13 +102,14 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 
 			invalidateHttpCache();
 
-			if ($feedDAO->updateFeed($id, $values)) {
+			$url_redirect = array('c' => 'subscription', 'params' => array('id' => $id));
+			if ($feedDAO->updateFeed($id, $values) !== false) {
 				$this->view->feed->_category($cat);
 				$this->view->feed->faviconPrepare();
 
-				Minz_Request::good(_t('feedback.sub.feed.updated'), array('c' => 'subscription', 'params' => array('id' => $id)));
+				Minz_Request::good(_t('feedback.sub.feed.updated'), $url_redirect);
 			} else {
-				Minz_Request::bad(_t('feedback.sub.feed.error'), array('c' => 'subscription'));
+				Minz_Request::bad(_t('feedback.sub.feed.error'), $url_redirect);
 			}
 		}
 	}