From 68916212b2541344f487354a5ec1e7895aa1370a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 30 Jun 2012 16:40:47 +0400 Subject: use Uncategorized coalesce in a few more places --- classes/feeds.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/feeds.php b/classes/feeds.php index e37401b8e..1e2d56696 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -869,7 +869,7 @@ class Feeds extends Protected_Handler { $query = "SELECT ttrss_feeds.id, ttrss_feeds.title, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms, cat_id,last_error, - ttrss_feed_categories.title AS category, + COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS category, ttrss_feed_categories.collapsed, value AS unread FROM ttrss_feeds LEFT JOIN ttrss_feed_categories @@ -905,7 +905,6 @@ class Feeds extends Protected_Handler { $cat_id = $line["cat_id"]; $tmp_category = $line["category"]; - if (!$tmp_category) $tmp_category = __("Uncategorized"); if ($category != $tmp_category && $enable_cats) { -- cgit v1.2.3