aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/DoctrineMigrations
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2018-09-07 13:46:30 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2018-09-07 13:46:30 +0200
commit7083c0a21d27e7e1bf45a9807a76844116d61fb8 (patch)
treeb72b5a0516d9114aeeccd6ecdb055ee240bda66a /app/DoctrineMigrations
parent44043ebe82a22470e2514d05efac324035ee809a (diff)
parent495f83c92539444bff7dfd6cd647b7d65a74f949 (diff)
downloadwallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.gz
wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.zst
wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.zip
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/DoctrineMigrations')
-rw-r--r--app/DoctrineMigrations/Version20170719231144.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/DoctrineMigrations/Version20170719231144.php b/app/DoctrineMigrations/Version20170719231144.php
index 04358c7c..93fe7f26 100644
--- a/app/DoctrineMigrations/Version20170719231144.php
+++ b/app/DoctrineMigrations/Version20170719231144.php
@@ -55,7 +55,7 @@ class Version20170719231144 extends WallabagMigration
55 } 55 }
56 56
57 // Just in case... 57 // Just in case...
58 if (count($ids) > 0) { 58 if (\count($ids) > 0) {
59 // Merge tags 59 // Merge tags
60 $this->addSql(' 60 $this->addSql('
61 UPDATE ' . $this->getTable('entry_tag') . ' 61 UPDATE ' . $this->getTable('entry_tag') . '