diff options
| author | Mario <mario@mariovavti.com> | 2022-06-01 07:00:21 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-06-01 07:00:21 +0000 |
| commit | e63f0438415bb364f3085286ca2f199e83ab187b (patch) | |
| tree | b107429276ebfc92dc9b4f78e302a4967e5bf0a6 /include/items.php | |
| parent | c5f33baf27d80e2a7ad7307eacd3137609eeb089 (diff) | |
| parent | 33dd0c83e377b8adf00559337d13784ec136cecb (diff) | |
| download | volse-hubzilla-e63f0438415bb364f3085286ca2f199e83ab187b.tar.gz volse-hubzilla-e63f0438415bb364f3085286ca2f199e83ab187b.tar.bz2 volse-hubzilla-e63f0438415bb364f3085286ca2f199e83ab187b.zip | |
Merge branch '7.4RC'7.4
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 7 |
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']), |