xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'FreshRSS/dev' into FreshRSS/beta

Browse Source
pull/863/head 1.1.1
Alexandre Alapetite 9 years ago
parent af0d423e37 384a146883
commit 38f6dbdd19
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/Models/EntryDAO.php

4
app/Models/EntryDAO.php
Unescape View File

@ -11,7 +11,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
$hasTransaction = false; $hasTransaction = false;
try { try {
$stm = null; $stm = null;
if ($name === 'lastSeen') { //v1.2 if ($name === 'lastSeen') { //v1.1.1
if (!$this->bd->inTransaction()) { if (!$this->bd->inTransaction()) {
$this->bd->beginTransaction(); $this->bd->beginTransaction();
$hasTransaction = true; $hasTransaction = true;
@ -29,7 +29,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
if ($hasTransaction) { if ($hasTransaction) {
$this->bd->rollBack(); $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)'); $stm = $this->bd->prepare('ALTER TABLE `' . $this->prefix . 'entry` ADD COLUMN hash BINARY(16)');
return $stm && $stm->execute(); return $stm && $stm->execute();
} }

Write Preview
Loading…
Cancel
Save