blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

headlines: fix whitebox reply not returned in an updated format

Browse source
This commit is contained in:
Andrew Dolgov 2015-07-13 13:29:13 +03:00
parent f45b67c53e
commit 9f5eca992b
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
classes/feeds.php
View file

@ -296,6 +296,8 @@ class Feeds extends Handler_Protected {
} }
} }
$reply['content'] = array();
if (!is_numeric($result) && $this->dbh->num_rows($result) > 0) { if (!is_numeric($result) && $this->dbh->num_rows($result) > 0) {
$lnum = $offset; $lnum = $offset;
@ -307,8 +309,6 @@ class Feeds extends Handler_Protected {
$expand_cdm = get_pref('CDM_EXPANDED'); $expand_cdm = get_pref('CDM_EXPANDED');
$reply['content'] = array();
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
$headline_row = ''; $headline_row = '';
@ -787,9 +787,9 @@ class Feeds extends Handler_Protected {
} }
if (!$offset && $message) { if (!$offset && $message) {
$reply['content'] .= "<div class='whiteBox'>$message"; $headline_row = "<div class='whiteBox'>$message";
$reply['content'] .= "<p><span class=\"insensitive\">"; $headline_row .= "<p><span class=\"insensitive\">";
$result = $this->dbh->query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds $result = $this->dbh->query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']); WHERE owner_uid = " . $_SESSION['uid']);
@ -797,7 +797,7 @@ class Feeds extends Handler_Protected {
$last_updated = $this->dbh->fetch_result($result, 0, "last_updated"); $last_updated = $this->dbh->fetch_result($result, 0, "last_updated");
$last_updated = make_local_datetime($last_updated, false); $last_updated = make_local_datetime($last_updated, false);
$reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated); $headline_row .= sprintf(__("Feeds last updated at %s"), $last_updated);
$result = $this->dbh->query("SELECT COUNT(id) AS num_errors $result = $this->dbh->query("SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]); FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
@ -805,14 +805,16 @@ class Feeds extends Handler_Protected {
$num_errors = $this->dbh->fetch_result($result, 0, "num_errors"); $num_errors = $this->dbh->fetch_result($result, 0, "num_errors");
if ($num_errors > 0) { if ($num_errors > 0) {
$reply['content'] .= "<br/>"; $headline_row .= "<br/>";
$reply['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">". $headline_row .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
__('Some feeds have update errors (click for details)')."</a>"; __('Some feeds have update errors (click for details)')."</a>";
} }
$reply['content'] .= "</span></p></div>"; $headline_row .= "</span></p></div>";
//array_push($reply['content'], array("id" => 0, "kind" => "status_message", "html" => $headline_row));
array_push($reply['content'], array("id" => 0, 'kind' => 'status_message', 'html' => $headline_row));
} }
} else if (is_numeric($result) && $result == -1) { } else if (is_numeric($result) && $result == -1) {
$reply['content'] = '';
$reply['first_id_changed'] = true; $reply['first_id_changed'] = true;
} }