Merge remote-tracking branch 'mike/master' into dev

2 files changed, 27 insertions, 4 deletions

diff --git a/include/items.php b/include/items.php
index 2cee376d0..b2c288b75 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4629,10 +4629,10 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
 				if(! stristr($image,z_root() . '/photo/'))
 					continue;
 				$image_uri = substr($image,strrpos($image,'/') + 1);
-				if(strpos($image_uri,'-') !== false)
-					$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
-				if(strpos($image_uri,'.') !== false)
-					$image_uri = substr($image_uri,0, strpos($image_uri,'.'));
+				if(strrpos($image_uri,'-') !== false)
+					$image_uri = substr($image_uri,0, strrpos($image_uri,'-'));
+				if(strrpos($image_uri,'.') !== false)
+					$image_uri = substr($image_uri,0, strrpos($image_uri,'.'));
 				if(! strlen($image_uri))
 					continue;
 				$srch = '<' . $xchan_hash . '>';
diff --git a/include/text.php b/include/text.php
index 646bfe749..edd0f7a5a 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3467,6 +3467,28 @@ function print_val($v) {
 
 }
 
+function array_path_exists($str,$arr) {
+
+	$ptr = $arr;
+	$search = explode('/', $str);
+
+	if($search) {
+		foreach($search as $s) {
+			if(array_key_exists($s,$ptr)) {
+				$ptr = $ptr[$s];
+			}
+			else {
+				return false;
+			}			
+		}
+		return true;
+	}
+
+	return false;
+
+}
+
+
 /**
  * @brief Generate a unique ID.
  *
@@ -3482,3 +3504,4 @@ function new_uuid() {
 
     return $hash;
 }
+