- patches for some errors

Marius Cramer · Marius Cramer · commit e956aca559ff · 2015-04-15T14:25:39.000+02:00
diff --git a/server/cron.php b/server/cron.php
@@ -74,7 +74,7 @@
 			unset($cronjob);
 			continue;
 		}
-		print 'Included ' . $class_name . ' from ' . $file_path . ' -> will now run job.' . "\n";
+		print 'Included ' . $class_name . ' from ' . $path . '/' . $f . ' -> will now run job.' . "\n";
 
 		$cronjob->run();
 
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -2365,7 +2365,7 @@ private function hhvm_update($data, $web_config) {
  		} elseif($data['new']['php'] != 'hhvm' && $data['old']['php'] == 'hhvm') {
 			exec('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' stop >/dev/null 2>&1');
 			exec('/usr/sbin/update-rc.d hhvm_' . $data['old']['system_user'] . ' remove >/dev/null 2>&1');
-			unlink('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' >/dev/null 2>&1');
+			unlink('/etc/init.d/hhvm_' . $data['old']['system_user']);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@`
`74`	`74`	`unset($cronjob);`
`75`	`75`	`continue;`
`76`	`76`	`}`
`77`		`- print 'Included ' . $class_name . ' from ' . $file_path . ' -> will now run job.' . "\n";`
	`77`	`+ print 'Included ' . $class_name . ' from ' . $path . '/' . $f . ' -> will now run job.' . "\n";`
`78`	`78`
`79`	`79`	`$cronjob->run();`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -2365,7 +2365,7 @@ private function hhvm_update($data, $web_config) {`
`2365`	`2365`	`} elseif($data['new']['php'] != 'hhvm' && $data['old']['php'] == 'hhvm') {`
`2366`	`2366`	`exec('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' stop >/dev/null 2>&1');`
`2367`	`2367`	`exec('/usr/sbin/update-rc.d hhvm_' . $data['old']['system_user'] . ' remove >/dev/null 2>&1');`
`2368`		`- unlink('/etc/init.d/hhvm_' . $data['old']['system_user'] . ' >/dev/null 2>&1');`
	`2368`	`+ unlink('/etc/init.d/hhvm_' . $data['old']['system_user']);`
`2369`	`2369`	`}`
`2370`	`2370`	`}`
`2371`	`2371`