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

Revert "Fix accidental use of emtpy array: [E_WARNING (2) plugins/af_readability/init.php:186 Invalid argument supplied for foreach()]" 

This reverts commit beaddcba96.
This commit is contained in:
Troy Engel 2015-12-05 14:49:54 -06:00
parent beaddcba96
commit 3e220fd131
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/af_readability/init.php
View File

@ -33,11 +33,9 @@ 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)) { if (!array($enabled_feeds)) $enabled_feeds = array();
$enabled_feeds = array();
} else { $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);
if (count($enabled_feeds) > 0) { if (count($enabled_feeds) > 0) {
@ -185,14 +183,12 @@ class Af_Readability extends Plugin {
private function filter_unknown_feeds($enabled_feeds) { private function filter_unknown_feeds($enabled_feeds) {
$tmp = array(); $tmp = array();
if (!empty($enabled_feeds)) { foreach ($enabled_feeds as $feed) {
foreach ($enabled_feeds as $feed) {
$result = db_query("SELECT id FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]); $result = db_query("SELECT id FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
array_push($tmp, $feed); array_push($tmp, $feed);
}
} }
} }