|
|
@ -248,6 +248,8 @@ class Feeds extends Handler_Protected {
|
|
|
|
false, 0, $include_children);
|
|
|
|
false, 0, $include_children);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") && $feed != -6;
|
|
|
|
|
|
|
|
|
|
|
|
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
|
|
|
|
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
|
|
|
|
|
|
|
|
|
|
|
|
$result = $qfh_ret[0];
|
|
|
|
$result = $qfh_ret[0];
|
|
|
@ -421,7 +423,7 @@ class Feeds extends Handler_Protected {
|
|
|
|
|
|
|
|
|
|
|
|
if (!get_pref('COMBINED_DISPLAY_MODE')) {
|
|
|
|
if (!get_pref('COMBINED_DISPLAY_MODE')) {
|
|
|
|
|
|
|
|
|
|
|
|
if (get_pref('VFEED_GROUP_BY_FEED')) {
|
|
|
|
if ($vfeed_group_enabled) {
|
|
|
|
if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
|
|
|
|
if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
|
|
|
|
|
|
|
|
|
|
|
|
$cur_feed_title = $line["feed_title"];
|
|
|
|
$cur_feed_title = $line["feed_title"];
|
|
|
@ -472,7 +474,7 @@ class Feeds extends Handler_Protected {
|
|
|
|
|
|
|
|
|
|
|
|
$reply['content'] .= "</div>";
|
|
|
|
$reply['content'] .= "</div>";
|
|
|
|
|
|
|
|
|
|
|
|
if (!get_pref('VFEED_GROUP_BY_FEED')) {
|
|
|
|
if (!$vfeed_group_enabled) {
|
|
|
|
if (@$line["feed_title"]) {
|
|
|
|
if (@$line["feed_title"]) {
|
|
|
|
$rgba = @$rgba_cache[$feed_id];
|
|
|
|
$rgba = @$rgba_cache[$feed_id];
|
|
|
|
|
|
|
|
|
|
|
@ -491,7 +493,7 @@ class Feeds extends Handler_Protected {
|
|
|
|
|
|
|
|
|
|
|
|
$reply['content'] .= $score_pic;
|
|
|
|
$reply['content'] .= $score_pic;
|
|
|
|
|
|
|
|
|
|
|
|
if ($line["feed_title"] && !get_pref('VFEED_GROUP_BY_FEED')) {
|
|
|
|
if ($line["feed_title"] && !$vfeed_group_enabled) {
|
|
|
|
|
|
|
|
|
|
|
|
$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
|
|
|
|
$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
|
|
|
|
style=\"cursor : pointer\"
|
|
|
|
style=\"cursor : pointer\"
|
|
|
@ -516,7 +518,7 @@ class Feeds extends Handler_Protected {
|
|
|
|
$line = $p->hook_render_article_cdm($line);
|
|
|
|
$line = $p->hook_render_article_cdm($line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (get_pref('VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
|
|
|
|
if ($vfeed_group_enabled && $line["feed_title"]) {
|
|
|
|
if ($feed_id != $vgroup_last_feed) {
|
|
|
|
if ($feed_id != $vgroup_last_feed) {
|
|
|
|
|
|
|
|
|
|
|
|
$cur_feed_title = $line["feed_title"];
|
|
|
|
$cur_feed_title = $line["feed_title"];
|
|
|
@ -592,7 +594,7 @@ class Feeds extends Handler_Protected {
|
|
|
|
|
|
|
|
|
|
|
|
$reply['content'] .= "</span>";
|
|
|
|
$reply['content'] .= "</span>";
|
|
|
|
|
|
|
|
|
|
|
|
if (!get_pref('VFEED_GROUP_BY_FEED')) {
|
|
|
|
if (!$vfeed_group_enabled) {
|
|
|
|
if (@$line["feed_title"]) {
|
|
|
|
if (@$line["feed_title"]) {
|
|
|
|
$rgba = @$rgba_cache[$feed_id];
|
|
|
|
$rgba = @$rgba_cache[$feed_id];
|
|
|
|
|
|
|
|
|
|
|
|