diff options
author | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-04-11 17:21:54 +0300 |
---|---|---|
committer | Maryana Rozhankivska <mariroz@mr.lviv.ua> | 2014-04-11 17:21:54 +0300 |
commit | 0f859c6f321af6dfaea66e04cde705ba97e6b5be (patch) | |
tree | c207e7071ee61772c54758e7079071da130d9455 /inc/poche/Database.class.php | |
parent | 5ce397847230c70c513ac4fbc3bfbb31498b443f (diff) | |
download | wallabag-0f859c6f321af6dfaea66e04cde705ba97e6b5be.tar.gz wallabag-0f859c6f321af6dfaea66e04cde705ba97e6b5be.tar.zst wallabag-0f859c6f321af6dfaea66e04cde705ba97e6b5be.zip |
error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now.
Diffstat (limited to 'inc/poche/Database.class.php')
-rwxr-xr-x | inc/poche/Database.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index d1044a6e..036c9d1b 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
@@ -245,7 +245,7 @@ class Database { | |||
245 | $sql_limit = "LIMIT ".$limit." OFFSET 0"; | 245 | $sql_limit = "LIMIT ".$limit." OFFSET 0"; |
246 | } | 246 | } |
247 | 247 | ||
248 | $sql = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND user_id=? ORDER BY id " . $sql_limit; | 248 | $sql = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=? ORDER BY id " . $sql_limit; |
249 | $query = $this->executeQuery($sql, array($user_id)); | 249 | $query = $this->executeQuery($sql, array($user_id)); |
250 | $entries = $query->fetchAll(); | 250 | $entries = $query->fetchAll(); |
251 | 251 | ||
@@ -253,7 +253,7 @@ class Database { | |||
253 | } | 253 | } |
254 | 254 | ||
255 | public function retrieveUnfetchedEntriesCount($user_id) { | 255 | public function retrieveUnfetchedEntriesCount($user_id) { |
256 | $sql = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND user_id=?"; | 256 | $sql = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=?"; |
257 | $query = $this->executeQuery($sql, array($user_id)); | 257 | $query = $this->executeQuery($sql, array($user_id)); |
258 | list($count) = $query->fetch(); | 258 | list($count) = $query->fetch(); |
259 | 259 | ||