From 90a0028d494405bc20c1409a7810246ebdd1bc75 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 23 Mar 2021 22:31:48 +0100
Subject: Fix DB lock bug during refresh (MariaDB) (#3559)

#fix https://github.com/FreshRSS/FreshRSS/issues/3552
---
 app/Controllers/feedController.php | 1 -
 app/Models/CategoryDAO.php         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 2e89b5c5e..7daba4822 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -24,7 +24,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Error::error(403);
 			}
 		}
-		$this->updateTTL();
 	}
 
 	/**
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 0a9bd68db..f36532ffd 100644
--- a/app/Models/CategoryDAO.php
+++ b/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;
-- 
cgit v1.2.3