Revert "do not unlink lockfiles (closes #703)"

[tt-rss.git] / update.php
diff --git a/update.php b/update.php

index d4160c7ba1cc557367184ee0a959b52a6477e62d..0141b1a8e5c31a072c3ebfe8219ab412f587d689 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -47,7 +47,7 @@
                 <head>
                 <title>Tiny Tiny RSS data update script.</title>
                 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-               <link rel="stylesheet" type="text/css" href="utility.css">
+               <link rel="stylesheet" type="text/css" href="css/utility.css">
                 </head>
  
                 <body>
@@ -175,7 +175,9 @@
                 }
  
                 update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
-               housekeeping_common(true);
+
+               if (!isset($options["pidlock"]) || $options["task"] == 0)
+                       housekeeping_common(true);
  
                 PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
         }
@@ -321,7 +323,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));