summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-05-31 20:52:54 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-05-31 20:52:54 +0200
commit38f6dbdd1915b8b496a58b5214efee1822496d8c (patch)
tree39c2206e126e29b3e3e33b3c8d976427d0ef54f1
parentaf0d423e3788039e01b79d4fbae55d947feda77b (diff)
parent384a146883548ba0274f8cbee0c2e67dc053f70e (diff)
Merge branch 'FreshRSS/dev' into FreshRSS/beta1.1.1
-rw-r--r--app/Models/EntryDAO.php4
1 files changed, 2 insertions, 2 deletions
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();
}