From fc2b26a6a27d19ecbfbb2202fd35b37568c65181 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 21 Apr 2008 05:53:19 +0100 Subject: add workaround for psql 8.3 stricter typechecking on SUBSTRING() (refs #201) --- modules/pref-feed-browser.php | 2 +- modules/pref-feeds.php | 2 +- modules/pref-users.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/pref-feed-browser.php b/modules/pref-feed-browser.php index e33103501..bdbb930d4 100644 --- a/modules/pref-feed-browser.php +++ b/modules/pref-feed-browser.php @@ -16,7 +16,7 @@ $result = db_query($link, "SELECT feed_url,site_url, - SUBSTRING(last_updated,1,19) AS last_updated + ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated FROM ttrss_feeds WHERE id = '$id' AND auth_login = '' AND auth_pass = '' AND private IS NOT true"); diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 9b718ace6..43be1cbe3 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -804,7 +804,7 @@ if ($_GET["slat"] == "true") { $show_last_article_info = true; $show_last_article_checked = "checked"; - $show_last_article_qpart = ", (SELECT SUBSTRING(MAX(updated),1,16) FROM ttrss_user_entries, + $show_last_article_qpart = ", (SELECT ".SUBSTRING_FOR_DATE."(MAX(updated),1,16) FROM ttrss_user_entries, ttrss_entries WHERE ref_id = ttrss_entries.id AND feed_id = F1.id) AS last_article"; } else if ($feeds_sort == "last_article") { diff --git a/modules/pref-users.php b/modules/pref-users.php index 4872a0d8f..399fc5e1e 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -197,7 +197,7 @@ $result = db_query($link, "SELECT id,login,access_level,email, - SUBSTRING(last_login,1,16) as last_login + ".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login FROM ttrss_users ORDER BY $sort"); -- cgit v1.2.3