From 96ba71e618468f7d28a04c4ebc7c46dd912ccd75 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 20:22:27 +0200
Subject: MySQL create table bug

https://github.com/FreshRSS/FreshRSS/issues/845
And updated version comments to 1.1.1
---
 app/Models/EntryDAO.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Models')

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index f939a0fb3..bd575989d 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -92,7 +92,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				return $this->addEntry($valuesTmp);
 			} elseif ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
 				Minz_Log::error('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2]
-				. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']. ' ' . $this->addEntryPrepared);
+					. ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']);
 			}
 			return false;
 		}
-- 
cgit v1.2.3


From 384a146883548ba0274f8cbee0c2e67dc053f70e Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 31 May 2015 20:48:18 +0200
Subject: Minor comment 1.1.1

https://github.com/FreshRSS/FreshRSS/issues/845
---
 app/Models/EntryDAO.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/Models')

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index bd575989d..9ddcfcfb3 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -11,7 +11,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 		$hasTransaction = false;
 		try {
 			$stm = null;
-			if ($name === 'lastSeen') {	//v1.2
+			if ($name === 'lastSeen') {	//v1.1.1
 				if (!$this->bd->inTransaction()) {
 					$this->bd->beginTransaction();
 					$hasTransaction = true;
@@ -29,7 +29,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 				if ($hasTransaction) {
 					$this->bd->rollBack();
 				}
-			} elseif ($name === 'hash') {	//v1.2
+			} elseif ($name === 'hash') {	//v1.1.1
 				$stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16)');
 				return $stm && $stm->execute();
 			}
-- 
cgit v1.2.3