summaryrefslogtreecommitdiff
path: root/app/Controllers/importExportController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-04-04 22:40:05 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-04-04 22:40:05 +0200
commit7b9ac8c58e49faaaf2d754768309e7865de1f4e1 (patch)
tree2b3bbc365e8fe5444ffa22e349800986f9bdac79 /app/Controllers/importExportController.php
parentdd8de21fb892a1e52881eb01dd931a1c0c00479c (diff)
parent711530a512b370d79b079205ce1f8376174f7f03 (diff)
Merge remote-tracking branch 'origin/sql_hash_lastUpdate' into dev
Diffstat (limited to 'app/Controllers/importExportController.php')
-rw-r--r--app/Controllers/importExportController.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index 589777b2a..26b163e43 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -361,7 +361,6 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
}
// Then, articles are imported.
- $prepared_statement = $this->entryDAO->addEntryPrepare();
$this->entryDAO->beginTransaction();
foreach ($article_object['items'] as $item) {
if (!isset($article_to_feed[$item['id']])) {
@@ -396,7 +395,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
}
$values = $entry->toArray();
- $id = $this->entryDAO->addEntry($values, $prepared_statement);
+ $id = $this->entryDAO->addEntry($values);
if (!$error && ($id === false)) {
$error = true;