Merge remote branch 'upstream/master'

5 files changed, 32 insertions, 17 deletions

diff --git a/include/Photo.php b/include/Photo.php
index 4d02b5c65..fce559999 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -87,6 +87,12 @@ class Photo {
 
 	}
 
+	public function rotate($degrees) {
+		$this->image  = imagerotate($this->image,$degrees,0);
+		$this->width  = imagesx($this->image);
+		$this->height = imagesy($this->image);
+	}	
+
 
 
 	public function scaleImageUp($min) {
diff --git a/include/auth.php b/include/auth.php
index 1341f3bb8..b87662fea 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -11,6 +11,13 @@ function nuke_session() {
 	unset($_SESSION['cid']);
 	unset($_SESSION['theme']);
 	unset($_SESSION['page_flags']);
+	unset($_SESSION['submanage']);
+	unset($_SESSION['my_url']);
+	unset($_SESSION['my_address']);
+	unset($_SESSION['addr']);
+	unset($_SESSION['return_url']);
+	unset($_SESSION['theme']);
+	unset($_SESSION['page_flags']);
 }
 
 
diff --git a/include/config.php b/include/config.php
index 4cff38090..12fc9cafc 100644
--- a/include/config.php
+++ b/include/config.php
@@ -77,11 +77,9 @@ function get_config($family, $key, $instore = false) {
 if(! function_exists('set_config')) {
 function set_config($family,$key,$value) {
 	global $a;
-	
 	// manage array value
 	$dbvalue = (is_array($value)?serialize($value):$value);
-	$dbvalue = (is_bool($value) ? intval($value) : $value);
-
+	$dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
 	if(get_config($family,$key,true) === false) {
 		$a->config[$family][$key] = $value;
 		$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
diff --git a/include/items.php b/include/items.php
index 91c9056fe..e5b640fd2 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1010,7 +1010,7 @@ function tag_deliver($uid,$item_id) {
 		'otype'        => 'item'
 	));
 
-	if((! $community_page) && (! prvgroup))
+	if((! $community_page) && (! $prvgroup))
 		return;
 
 
diff --git a/include/socgraph.php b/include/socgraph.php
index 592779089..eccb133cc 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -71,20 +71,24 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
 		$name = $entry->displayName;
 
-		foreach($entry->urls as $url) {
-			if($url->type == 'profile') {
-				$profile_url = $url->value;
-				continue;
-			}
-			if($url->type == 'webfinger') {
-				$connect_url = str_replace('acct:' , '', $url->value);
-				continue;
+		if(isset($entry->urls)) {
+			foreach($entry->urls as $url) {
+				if($url->type == 'profile') {
+					$profile_url = $url->value;
+					continue;
+				}
+				if($url->type == 'webfinger') {
+					$connect_url = str_replace('acct:' , '', $url->value);
+					continue;
+				}
 			}
-		} 
-		foreach($entry->photos as $photo) {
-			if($photo->type == 'profile') {
-				$profile_photo = $photo->value;
-				continue;
+		}
+		if(isset($entry->photos)) { 
+			foreach($entry->photos as $photo) {
+				if($photo->type == 'profile') {
+					$profile_photo = $photo->value;
+					continue;
+				}
 			}
 		}