fix ttrss_feeds.last_update defaulting to 0 on mysql, set to null instead

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 310081485ec2d097c8984c6987cecaf7f96e5481..92d6e9790b7d8a055d1c721ba2a10faa003c6106 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
        define('EXPECTED_CONFIG_VERSION', 26);
-       define('SCHEMA_VERSION', 129);
+       define('SCHEMA_VERSION', 130);
 
        define('LABEL_BASE_INDEX', -1024);
        define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -456,7 +456,7 @@
                                                        'method' => 'GET',
                                                        'protocol_version'=> 1.1
                                          )));
-                       } 
+                       }
 
                        $old_error = error_get_last();
 
@@ -1582,7 +1582,8 @@
                        FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
                                (ttrss_labels2.id = label_id)
                                LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
-                               WHERE ttrss_labels2.owner_uid = $owner_uid GROUP BY ttrss_labels2.id,
+                               WHERE ttrss_labels2.owner_uid = $owner_uid AND u1.owner_uid = $owner_uid
+                               GROUP BY ttrss_labels2.id,
                                        ttrss_labels2.caption");
 
                while ($line = db_fetch_assoc($result)) {