X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update.php;h=d8ea52361ac27c0571f51c4628a5c31f86638427;hb=1ffe3391f902c4baa984982f19e61a0e45de21ff;hp=e13abafca2955d08037f8e1040d0b40bcacd3cbb;hpb=fa8e7ea2613e611a9c532bb923727de352a53b2a;p=tt-rss.git

diff --git a/update.php b/update.php
index e13abafc..d8ea5236 100755
--- a/update.php
+++ b/update.php
@@ -36,7 +36,7 @@
 			"list-plugins",
 			"help");
 
-	foreach ($pluginhost->get_commands() as $command => $data) {
+	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
 		array_push($longopts, $command . $data["suffix"]);
 	}
 
@@ -79,7 +79,7 @@
 		print "  --help               - show this help\n";
 		print "Plugin options:\n";
 
-		foreach ($pluginhost->get_commands() as $command => $data) {
+		foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
 			$args = $data['arghelp'];
 			printf(" --%-19s - %s\n", "$command $args", $data["description"]);
 		}
@@ -128,7 +128,7 @@
 	$lock_handle = make_lockfile($lock_filename);
 	$must_exit = false;
 
-	if (isset($options["task"])) {
+	if (isset($options["task"]) && isset($options["pidlock"])) {
 		$waits = $options["task"] * 5;
 		_debug("Waiting before update ($waits)");
 		sleep($waits);
@@ -161,8 +161,7 @@
 		$rc = cleanup_tags( 14, 50000);
 		_debug("Cleaned $rc cached tags.");
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
 
 	if (isset($options["feedbrowser"])) {
@@ -200,8 +199,7 @@
 
 			_debug("Cleaned $rc cached tags.");
 
-			global $pluginhost;
-			$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 		}
 
 	}
@@ -368,7 +366,7 @@
 
 	}
 
-	$pluginhost->run_commands($options);
+	PluginHost::getInstance()->run_commands($options);
 
 	if ($lock_handle != false) {
 		fclose($lock_handle);