Merge pull request #180 from rlerdorf/master

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index 0853f3dd551e01630134113750d5f28637313bb1..f542a390bf833fbfcaed6f4d6a002acbb7ae44ba 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -148,18 +148,8 @@
        }
 
        if (isset($options["feeds"])) {
-               // Update all feeds needing a update.
                update_daemon_common();
-
-               // Update feedbrowser
-               $count = update_feedbrowser_cache();
-               _debug("Feedbrowser updated, $count feeds processed.");
-
-               // Purge orphans and cleanup tags
-               purge_orphans( true);
-
-               $rc = cleanup_tags( 14, 50000);
-               _debug("Cleaned $rc cached tags.");
+               housekeeping_common(true);
 
                PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
        }
@@ -185,15 +175,8 @@
                }
 
                update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
+               housekeeping_common(true);
 
-               $count = update_feedbrowser_cache();
-               _debug("Feedbrowser updated, $count feeds processed.");
-
-               purge_orphans( true);
-
-               $rc = cleanup_tags( 14, 50000);
-
-               _debug("Cleaned $rc cached tags.");
                PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
        }
 
@@ -338,7 +321,7 @@
        }
 
        if (isset($options["list-plugins"])) {
-               $tmppluginhost = new PluginHost(Db::get());
+               $tmppluginhost = new PluginHost();
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL);
                $enabled = array_map("trim", explode(",", PLUGINS));