Merge branch 'master' into trinidad

1 files changed, 16 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index 28bf5517a..fe026d2e7 100755
--- a/boot.php
+++ b/boot.php
@@ -2184,3 +2184,19 @@ function get_poller_runtime() {
 	$t = get_config('system','lastpoll');
 	return relative_date($t);
 }
+
+function z_get_upload_dir() {
+	$upload_dir = get_config('system','uploaddir');
+	if(! $upload_dir)
+		$upload_dir = ini_get('upload_tmp_dir');
+	if(! $upload_dir)
+		$upload_dir = sys_get_temp_dir();
+	return $upload_dir;
+}
+
+function z_get_temp_dir() {
+	$temp_dir = get_config('system','tempdir');
+	if(! $temp_dir)
+		$temp_dir = sys_get_temp_dir();
+	return $upload_dir;
+}