Browse Source

Fix DB lock bug during refresh (MariaDB) (#3559)

#fix https://github.com/FreshRSS/FreshRSS/issues/3552
Alexandre Alapetite 5 years ago
parent
commit
90a0028d49
2 changed files with 1 additions and 2 deletions
  1. 0 1
      app/Controllers/feedController.php
  2. 1 1
      app/Models/CategoryDAO.php

+ 0 - 1
app/Controllers/feedController.php

@@ -24,7 +24,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Error::error(403);
 			}
 		}
-		$this->updateTTL();
 	}
 
 	/**

+ 1 - 1
app/Models/CategoryDAO.php

@@ -148,7 +148,7 @@ SQL;
 		} else {
 			$info = $stm == null ? $this->pdo->errorInfo() : $stm->errorInfo();
 			if ($this->autoUpdateDb($info)) {
-				return $this->updateCategory($valuesTmp);
+				return $this->updateCategory($id, $valuesTmp);
 			}
 			Minz_Log::error('SQL error updateCategory: ' . json_encode($info));
 			return false;