valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'af-readability' into 'master' 

Fix array checking method in 2 places, add array check in one location for af_readability

See: https://tt-rss.org/gitlab/fox/tt-rss/merge_requests/19

Update method of array checking to is_array() in 2 locations, add the same check in another location that could have compared a NULL.

See merge request !20
This commit is contained in:
Andrew Dolgov 2015-12-06 00:22:29 +03:00
parent f61f2a2699 5d5f100f4f
commit c4d0e08060
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/af_readability/init.php
View File

@ -33,7 +33,7 @@ class Af_Readability extends Plugin {
print_notice("Enable the plugin for specific feeds in the feed editor."); print_notice("Enable the plugin for specific feeds in the feed editor.");
$enabled_feeds = $this->host->get($this, "enabled_feeds"); $enabled_feeds = $this->host->get($this, "enabled_feeds");
if (!array($enabled_feeds)) $enabled_feeds = array(); if (!is_array($enabled_feeds)) $enabled_feeds = array();
$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds); $enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
$this->host->set($this, "enabled_feeds", $enabled_feeds); $this->host->set($this, "enabled_feeds", $enabled_feeds);
@ -60,7 +60,7 @@ class Af_Readability extends Plugin {
print "<div class=\"dlgSecCont\">"; print "<div class=\"dlgSecCont\">";
$enabled_feeds = $this->host->get($this, "enabled_feeds"); $enabled_feeds = $this->host->get($this, "enabled_feeds");
if (!array($enabled_feeds)) $enabled_feeds = array(); if (!is_array($enabled_feeds)) $enabled_feeds = array();
$key = array_search($feed_id, $enabled_feeds); $key = array_search($feed_id, $enabled_feeds);
$checked = $key !== FALSE ? "checked" : ""; $checked = $key !== FALSE ? "checked" : "";
@ -169,6 +169,8 @@ class Af_Readability extends Plugin {
function hook_article_filter($article) { function hook_article_filter($article) {
$enabled_feeds = $this->host->get($this, "enabled_feeds"); $enabled_feeds = $this->host->get($this, "enabled_feeds");
if (!is_array($enabled_feeds)) return $article;
$key = array_search($article["feed"]["id"], $enabled_feeds); $key = array_search($article["feed"]["id"], $enabled_feeds);
if ($key === FALSE) return $article; if ($key === FALSE) return $article;