Merge branch 'boot' into 'dev'

Correct variable in boot.php See merge request hubzilla/core!1495
2019-01-29 10:06:18 +01:00 · 2019-01-29 10:06:18 +01:00 · 27e415e664
commit 27e415e664
parent c57a4cf926 ec6e130eb3
1 changed files with 12 additions and 14 deletions
--- a/boot.php
+++ b/boot.php
@ -1833,8 +1833,6 @@ function proc_run(){

 	$args = func_get_args();

-	$newargs = array();
-
 	if(! count($args))
 		return;

@ -2401,7 +2399,7 @@ function z_get_temp_dir() {
 	if(! $temp_dir)
 		$temp_dir = sys_get_temp_dir();

-	return $upload_dir;
+	return $temp_dir;
 }