diff options
| -rw-r--r-- | functions.php | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/functions.php b/functions.php index 4ce670033..6deeef461 100644 --- a/functions.php +++ b/functions.php @@ -4275,6 +4275,12 @@ if ($is_cat) $cat_q = "&is_cat=$is_cat"; + if ($search) { + $search_q = "&q=$search&m=$match_on&smode=$search_mode"; + } else { + $search_q = ""; + } + $rss_link = htmlspecialchars(get_self_url_prefix() . "/backend.php?op=rss&id=$feed_id$cat_q$search_q"); @@ -4323,12 +4329,6 @@ } } - if ($search) { - $search_q = "&q=$search&m=$match_on&smode=$search_mode"; - } else { - $search_q = ""; - } - $reply .= " <a href=\"#\" title=\"".__("View as RSS feed")."\" @@ -5231,14 +5231,15 @@ $reply['content'] .= $labels_str; - /* if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) { + if (!get_pref($link, 'VFEED_GROUP_BY_FEED') && + defined('_SHOW_FEED_TITLE_IN_VFEEDS')) { if (@$line["feed_title"]) { - print "<span class=\"hlFeed\"> + $reply['content'] .= "<span class=\"hlFeed\"> (<a href=\"#\" onclick=\"viewfeed($feed_id)\">". $line["feed_title"]."</a>) </span>"; } - } */ + } $reply['content'] .= "</div>"; @@ -5326,6 +5327,16 @@ $reply['content'] .= $labels_str; + if (!get_pref($link, 'VFEED_GROUP_BY_FEED') && + defined('_SHOW_FEED_TITLE_IN_VFEEDS')) { + if (@$line["feed_title"]) { + $reply['content'] .= "<span class=\"hlFeed\"> + (<a href=\"#\" onclick=\"viewfeed($feed_id)\">". + $line["feed_title"]."</a>) + </span>"; + } + } + if (!$expand_cdm) $content_hidden = "style=\"display : none\""; else |