diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/api.php | 6 | ||||
| -rw-r--r-- | classes/backend.php | 23 |
2 files changed, 15 insertions, 14 deletions
diff --git a/classes/api.php b/classes/api.php index 4b24b0110..a23f20ae2 100644 --- a/classes/api.php +++ b/classes/api.php @@ -309,7 +309,7 @@ class API extends Handler { "published" => sql_bool_to_bool($line["published"]), "comments" => $line["comments"], "author" => $line["author"], - "updated" => strtotime($line["updated"]), + "updated" => (int) strtotime($line["updated"]), "content" => $line["cached_content"] != "" ? $line["cached_content"] : $line["content"], "feed_id" => $line["feed_id"], "attachments" => $attachments @@ -563,7 +563,7 @@ class API extends Handler { "unread" => (int)$unread, "has_icon" => $has_icon, "cat_id" => (int)$line["cat_id"], - "last_updated" => strtotime($line["last_updated"]), + "last_updated" => (int) strtotime($line["last_updated"]), "order_id" => (int) $line["order_id"], ); @@ -604,7 +604,7 @@ class API extends Handler { "unread" => sql_bool_to_bool($line["unread"]), "marked" => sql_bool_to_bool($line["marked"]), "published" => sql_bool_to_bool($line["published"]), - "updated" => strtotime($line["updated"]), + "updated" => (int) strtotime($line["updated"]), "is_updated" => $is_updated, "title" => $line["title"], "link" => $line["link"], diff --git a/classes/backend.php b/classes/backend.php index d9a7a9fec..5473c5c79 100644 --- a/classes/backend.php +++ b/classes/backend.php @@ -39,18 +39,19 @@ class Backend extends Handler { foreach ($hotkeys as $action => $description) { - foreach ($omap[$action] as $sequence) { - if (strpos($sequence, "|") !== FALSE) { - $sequence = substr($sequence, - strpos($sequence, "|")+1, - strlen($sequence)); + if (is_array($omap[$action])) { + foreach ($omap[$action] as $sequence) { + if (strpos($sequence, "|") !== FALSE) { + $sequence = substr($sequence, + strpos($sequence, "|")+1, + strlen($sequence)); + } + + print "<li>"; + print "<span class='hksequence'>$sequence</span>"; + print $description; + print "</li>"; } - - print "<li>"; - print "<span class='hksequence'>$sequence</span>"; - print $description; - print "</li>"; - } } } |