diff options
| author | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-07-07 13:57:06 -0400 |
| commit | 3b96b0ed7cf8d960dd3ec2208ad8addb584bc1c9 (patch) | |
| tree | d83db38f58511d5648b6bd665ab3760d74e73875 /classes/feeds.php | |
| parent | ef3a8db1cc83e02a9f8933869d19f299f2abe72a (diff) | |
| parent | e4e9ac1fc288d6715f6419cd4c8a44386362ecf0 (diff) | |
Merge branch 'master' into hookhead
Conflicts:
include/functions.php
changes for conflicts with master
Diffstat (limited to 'classes/feeds.php')
| -rw-r--r-- | classes/feeds.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 44af9ae0b..ccc0548db 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -380,9 +380,9 @@ class Feeds extends Handler_Protected { title=\"$score\">"; if ($score > 500) { - $hlc_suffix = "H"; + $hlc_suffix = "high"; } else if ($score < -100) { - $hlc_suffix = "L"; + $hlc_suffix = "low"; } else { $hlc_suffix = ""; } @@ -451,8 +451,8 @@ class Feeds extends Handler_Protected { $reply['content'] .= "</div>"; $reply['content'] .= "<div onclick='return hlClicked(event, $id)' - class=\"hlTitle\"><span class='hlContent$hlc_suffix'>"; - $reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title\" + class=\"hlTitle\"><span class='hlContent $hlc_suffix'>"; + $reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\" href=\"" . htmlspecialchars($line["link"]) . "\" onclick=\"\">" . truncate_string($line["title"], 200); @@ -540,7 +540,7 @@ class Feeds extends Handler_Protected { $expanded_class = $expand_cdm ? "expanded" : "expandable"; - $reply['content'] .= "<div class=\"cdm $expanded_class $class\" + $reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\" id=\"RROW-$id\" $mouseover_attrs>"; $reply['content'] .= "<div class=\"cdmHeader\" style=\"$row_background\">"; @@ -557,8 +557,8 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<span id=\"RTITLE-$id\" onclick=\"return cdmClicked(event, $id);\" - class=\"titleWrap$hlc_suffix\"> - <a class=\"title\" + class=\"titleWrap $hlc_suffix\"> + <a class=\"title $hlc_suffix\" target=\"_blank\" href=\"". htmlspecialchars($line["link"])."\">". $line["title"] . @@ -864,7 +864,7 @@ class Feeds extends Handler_Protected { $override_order = "ttrss_entries.title"; break; case "date_reverse": - $override_order = "date_entered, updated"; + $override_order = "score DESC, date_entered, updated"; break; case "feed_dates": $override_order = "updated DESC"; |