Merge branch 'master' into trinidad

2 files changed, 31 insertions, 7 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;
+}
diff --git a/mod/profiles.php b/mod/profiles.php
index 6bdc7f11a..fa6a6e35c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -11,7 +11,7 @@ function profiles_init(&$a) {
 
 	if((argc() > 2) && (argv(1) === "drop") && intval(argv(2))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
-			intval($a->argv[2]),
+			intval(argv(2)),
 			intval(local_user())
 		);
 		if(! count($r)) {
@@ -159,9 +159,13 @@ function profiles_init(&$a) {
 	if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
 		if(feature_enabled(local_user(),'multi_profiles'))
 			$id = $a->argv[1];
-		else
-			$id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
-
+		else {
+			$x = q("select id from profile where uid = %d and is_default = 1",
+				intval(local_user())
+			);
+			if($x)
+				$id = $x[0]['id'];
+		}
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($id),
 			intval(local_user())
@@ -564,9 +568,13 @@ function profiles_content(&$a) {
 	if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
 		if(feature_enabled(local_user(),'multi_profiles'))
 			$id = $a->argv[1];
-		else
-			$id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
-		
+		else {
+			$x = q("select id from profile where uid = %d and is_default = 1",
+				intval(local_user())
+			);
+			if($x)
+				$id = $x[0]['id'];
+		}		
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($id),
 			intval(local_user())