summaryrefslogtreecommitdiff
path: root/classes/pref
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-05-07 01:34:49 -0700
committerAndrew Dolgov <[email protected]>2013-05-07 01:34:49 -0700
commita4fd183b5853867a9293dba438512d8400e6b65e (patch)
tree9776db47df16c7daa91f7a0e2c257031be75d33e /classes/pref
parent75933cf00d4331fd27821af03cadbb2e7c83da79 (diff)
parent6f7798b6434f5ef6073447998c436901b507e3df (diff)
Merge pull request #180 from rlerdorf/master
Fix some bugs found by static analysis
Diffstat (limited to 'classes/pref')
-rw-r--r--classes/pref/filters.php2
-rw-r--r--classes/pref/prefs.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 4dbee5906..bcc7b5aec 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -83,8 +83,6 @@ class Pref_Filters extends Handler_Protected {
}
}
- $feed_title = getFeedTitle($feed);
-
$qfh_ret = queryFeedHeadlines(-4, 30, "", false, false, false,
"date_entered DESC", 0, $_SESSION["uid"], $filter);
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index ba83a9900..fb6795957 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -747,7 +747,7 @@ class Pref_Prefs extends Handler_Protected {
$system_enabled = array_map("trim", explode(",", PLUGINS));
$user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
- $tmppluginhost = new PluginHost(Db::get());
+ $tmppluginhost = new PluginHost();
$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
$tmppluginhost->load_data(true);