diff options
author | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-20 16:59:19 +0000 |
commit | 77accf45df3072bf0e3fe1e919bb75fc14313119 (patch) | |
tree | 84be283769a6849f4916880739044a163e6f4761 /classes/feeds.php | |
parent | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (diff) | |
parent | 2d2d08fc41dec694ac0895368eff3eb80a173a5b (diff) |
fix merge conflict with stylesheet tags
Diffstat (limited to 'classes/feeds.php')
-rw-r--r-- | classes/feeds.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index c464303c1..0568eb985 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -263,6 +263,8 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info); + $expand_cdm = get_pref($this->link, 'CDM_EXPANDED'); + while ($line = db_fetch_assoc($result)) { $class = ($lnum % 2) ? "even" : "odd"; @@ -512,8 +514,6 @@ class Feeds extends Handler_Protected { } } - $expand_cdm = get_pref($this->link, 'CDM_EXPANDED'); - $mouseover_attrs = "onmouseover='postMouseIn($id)' onmouseout='postMouseOut($id)'"; @@ -627,16 +627,17 @@ class Feeds extends Handler_Protected { } $reply['content'] .= "<span id=\"CWRAP-$id\">"; - $reply['content'] .= $line["content"]; - $reply['content'] .= "</span>"; -/* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM - ttrss_feeds WHERE id = ". - (($line['feed_id'] == null) ? $line['orig_feed_id'] : - $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]); + if (!$expand_cdm) { + $reply['content'] .= "<span id=\"CENCW-$id\">"; + $reply['content'] .= htmlspecialchars($line["content"]); + $reply['content'] .= "</span."; + + } else { + $reply['content'] .= $line["content"]; + } - $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result, - 0, "always_display_enclosures")); */ + $reply['content'] .= "</span>"; $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); @@ -945,6 +946,5 @@ class Feeds extends Handler_Protected { return $reply; } - } ?> |