aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/items.php')
-rw-r--r--include/items.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 8a2faa623..d4c27ab28 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3219,6 +3219,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
}
+ $arr['title'] = $item['title'];
$arr['tgt_type'] = $item['tgt_type'];
$arr['target'] = $item['target'];
@@ -4830,7 +4831,10 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
$match = null;
// match img and zmg image links
if(preg_match_all("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/",$body,$match)) {
- $images = $match[2];
+
+ // The URI can be in both places
+ $images = array_merge($match[1], $match[2]);
+
if($images) {
foreach($images as $image) {
if(! stristr($image,z_root() . '/photo/'))
@@ -4848,6 +4852,7 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
dbesc($image_uri),
intval($uid)
);
+
if($r && $r[0]['folder']) {
$f = q("select * from attach where hash = '%s' and is_dir = 1 and uid = %d limit 1",
dbesc($r[0]['folder']),