valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use Uncategorized coalesce in a few more places

This commit is contained in:
Andrew Dolgov 2012-06-30 16:40:47 +04:00
parent 310fa2ddef
commit 68916212b2
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/feeds.php
View File

@ -869,7 +869,7 @@ class Feeds extends Protected_Handler {
$query = "SELECT ttrss_feeds.id, ttrss_feeds.title, $query = "SELECT ttrss_feeds.id, ttrss_feeds.title,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
cat_id,last_error, cat_id,last_error,
ttrss_feed_categories.title AS category, COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS category,
ttrss_feed_categories.collapsed, ttrss_feed_categories.collapsed,
value AS unread value AS unread
FROM ttrss_feeds LEFT JOIN ttrss_feed_categories FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
@ -905,7 +905,6 @@ class Feeds extends Protected_Handler {
$cat_id = $line["cat_id"]; $cat_id = $line["cat_id"];
$tmp_category = $line["category"]; $tmp_category = $line["category"];
if (!$tmp_category) $tmp_category = __("Uncategorized");
if ($category != $tmp_category && $enable_cats) { if ($category != $tmp_category && $enable_cats) {

4
include/functions.php
View File

@ -2850,7 +2850,7 @@
$result = db_query($link, "SELECT ttrss_entries.title, $result = db_query($link, "SELECT ttrss_entries.title,
ttrss_feeds.title AS feed_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, date_updated,
ttrss_user_entries.ref_id, ttrss_user_entries.ref_id,
link, link,
@ -2897,8 +2897,6 @@
} */ } */
if (get_pref($link, 'ENABLE_FEED_CATS', $user_id)) { 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']; $line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
} }