more work on PGSQL 8.3 compatibility (refs #201)

diff --git a/functions.php b/functions.php
index 5044976f1e1c23fc112feacdf59ae780a85ec63c..3390eca825e5adbcaa942c172c23bf34b2feb298 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -1108,8 +1108,8 @@
 
                                $result = db_query($link, "SELECT 
                                                id,content_hash,no_orig_date,title,
-                                               substring(date_entered,1,19) as date_entered,
-                                               substring(updated,1,19) as updated,
+                                               ".SUBSTRING_FOR_DATE."(date_entered,1,19) as date_entered,
+                                               ".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
                                                num_comments
                                        FROM 
                                                ttrss_entries 

diff --git a/modules/pref-feed-browser.php b/modules/pref-feed-browser.php
index bdbb930d4a293b5d6bbb50363a4f4f151ad1662d..a80109bc575f3efd0e1e4604885279b972fe02c3 100644 (file)
--- a/modules/pref-feed-browser.php
+++ b/modules/pref-feed-browser.php
@@ -44,8 +44,8 @@
                                $result = db_query($link, "SELECT 
                                                ttrss_entries.title,
                                                content,link,
-                                               substring(date_entered,1,19) as date_entered,
-                                               substring(updated,1,19) as updated
+                                               ".SUBSTRING_FOR_DATE."(date_entered,1,19) as date_entered,
+                                               ".SUBSTRING_FOR_DATE."(updated,1,19) as updated
                                        FROM ttrss_entries,ttrss_user_entries
                                        WHERE   ttrss_entries.id = ref_id AND feed_id = '$id'
                                        ORDER BY updated DESC LIMIT 5");

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 43be1cbe397febb98e3e0d5eaadb8d36e9fccb03..6bd6b4aba46d3d967a4feece3022980dde46eff0 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -821,7 +821,7 @@
                                F1.id,
                                F1.title,
                                F1.feed_url,
-                               substring(F1.last_updated,1,16) AS last_updated,
+                               ".SUBSTRING_FOR_DATE."(F1.last_updated,1,16) AS last_updated,
                                F1.parent_feed,
                                F1.update_interval,
                                F1.last_error,