diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-21 23:48:44 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-21 23:48:44 +0400 |
| commit | 9d9432dab87e3887e4f482ac5afff1586530c692 (patch) | |
| tree | cc3b1124d9352471f4a489163510dddb28be4fba | |
| parent | d98e76d9c2d6f0e5ef7ca4f9ef32bc6f7daf8ea2 (diff) | |
| parent | 043dacd3b1d39fe1eedecc2ab40f6bc153df3684 (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
| -rw-r--r-- | classes/feeds.php | 4 | ||||
| -rw-r--r-- | tt-rss.css | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index b8ef1f544..779614dce 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -450,12 +450,14 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<span class=\"hlUpdated\">"; - if (@$line["feed_title"]) { + if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { + if (@$line["feed_title"]) { $reply['content'] .= "<div class=\"hlFeed\"> <a href=\"#\" onclick=\"viewfeed($feed_id)\">". $line["feed_title"]."</a> </div>"; } + } $reply['content'] .= "$updated_fmt</span>"; $reply['content'] .= "<div class=\"hlRight\">"; diff --git a/tt-rss.css b/tt-rss.css index a6c511967..9fc52b209 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -485,6 +485,7 @@ div.hlFeed, div.hlFeed a { color : gray; font-style : italic; font-weight : normal; + white-space: nowrap; } div.hlFeed a:hover { |