aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-12-01 21:43:54 +0100
committerMario Vavti <mario@mariovavti.com>2018-12-01 21:43:54 +0100
commitfdb04592887bd9bb804ee63ac320d04fe0968a80 (patch)
treef3228e53a96eee6a5218f4b04a5949e54c62180b /include
parentcded6b11366e15d6d4ac3eb6d9f86f4d0a60fa7c (diff)
parent6f22e47febdfb46494a0e1681e3eabdbd00fe72b (diff)
downloadvolse-hubzilla-fdb04592887bd9bb804ee63ac320d04fe0968a80.tar.gz
volse-hubzilla-fdb04592887bd9bb804ee63ac320d04fe0968a80.tar.bz2
volse-hubzilla-fdb04592887bd9bb804ee63ac320d04fe0968a80.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php8
-rw-r--r--include/text.php23
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;
}
+