diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-05-19 08:06:56 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-05-19 08:06:56 +0300 |
| commit | eab69f8796c1d42b2e0d08282b5ff1859f689a8a (patch) | |
| tree | a7ec25ba4300ded6cccd974857e49a0debbd019c /classes/Pref_Feeds.php | |
| parent | f4973264d35cd95a110225b2e274a38bf9c7f3a6 (diff) | |
| parent | ce36b27a0d01bcc61114028d0f8ec3d3e20d30de (diff) | |
Merge branch 'feature/orm-and-misc' into 'master'
Use ORM in more places, deprecate const SUBSTRING_FOR_DATE, some minor fixes
See merge request tt-rss/tt-rss!135
Diffstat (limited to 'classes/Pref_Feeds.php')
| -rw-r--r-- | classes/Pref_Feeds.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/Pref_Feeds.php b/classes/Pref_Feeds.php index 75ae053bd..d27b7d750 100644 --- a/classes/Pref_Feeds.php +++ b/classes/Pref_Feeds.php @@ -74,7 +74,7 @@ class Pref_Feeds extends Handler_Protected { $feeds_obj = ORM::for_table('ttrss_feeds') ->table_alias('f') ->select_many('id', 'title', 'last_error', 'update_interval') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->left_outer_join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue') ->select_expr('COUNT(ue.int_id) AS num_articles') ->where(['cat_id' => $cat_id, 'owner_uid' => $_SESSION['uid']]) @@ -261,7 +261,7 @@ class Pref_Feeds extends Handler_Protected { $feeds_obj = ORM::for_table('ttrss_feeds') ->table_alias('f') ->select_many('id', 'title', 'last_error', 'update_interval') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->left_outer_join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue') ->select_expr('COUNT(ue.int_id) AS num_articles') ->where('owner_uid', $_SESSION['uid']) @@ -305,7 +305,7 @@ class Pref_Feeds extends Handler_Protected { $feeds_obj = ORM::for_table('ttrss_feeds') ->table_alias('f') ->select_many('id', 'title', 'last_error', 'update_interval') - ->select_expr(SUBSTRING_FOR_DATE.'(last_updated,1,19)', 'last_updated') + ->select_expr('SUBSTRING_FOR_DATE(last_updated,1,19)', 'last_updated') ->left_outer_join('ttrss_user_entries', [ 'ue.feed_id', '=', 'f.id'], 'ue') ->select_expr('COUNT(ue.int_id) AS num_articles') ->where('owner_uid', $_SESSION['uid']) |