summaryrefslogtreecommitdiff
path: root/include/functions.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-06-30 16:40:47 +0400
committerAndrew Dolgov <[email protected]>2012-06-30 16:40:47 +0400
commit68916212b2541344f487354a5ec1e7895aa1370a (patch)
treeade732b873f27812fc22c4cb732efb708e3cea52 /include/functions.php
parent310fa2ddef16793656315244c1c68fc6008a79a4 (diff)
use Uncategorized coalesce in a few more places
Diffstat (limited to 'include/functions.php')
-rw-r--r--include/functions.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php
index 96b502d58..4b8929a05 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2850,7 +2850,7 @@
$result = db_query($link, "SELECT ttrss_entries.title,
ttrss_feeds.title AS feed_title,
- ttrss_feed_categories.title AS cat_title,
+ COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS cat_title,
date_updated,
ttrss_user_entries.ref_id,
link,
@@ -2897,8 +2897,6 @@
} */
if (get_pref($link, 'ENABLE_FEED_CATS', $user_id)) {
- if (!$line['cat_title']) $line['cat_title'] = __("Uncategorized");
-
$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
}