diff options
| author | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
| commit | f72d3512242d13fbba69b77a739319a9cd58627c (patch) | |
| tree | d59c8904fda78b04ee19e42343d8c7ca56c67a5f /include/photos.php | |
| parent | 3e7e0a3c43ddb742a6518a3b38b89e3d9675eae5 (diff) | |
| parent | 23f897b8aedac8a99aa81ac7799ec67ca196d407 (diff) | |
| download | volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.gz volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.bz2 volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.zip | |
Merge branch 'master' into photothread
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/photos.php b/include/photos.php index e0d1762bb..123cd0659 100644 --- a/include/photos.php +++ b/include/photos.php @@ -208,9 +208,9 @@ function photo_upload($channel, $observer, $args) { $arr['deny_gid'] = $str_group_deny; - $arr['body'] = '[url=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' + $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . '[img]' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]' - . '[/url]'; + . '[/zrl]'; $item_id = item_store($arr); @@ -350,9 +350,9 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { $arr['deny_cid'] = $photo['deny_cid']; $arr['deny_gid'] = $photo['deny_gid']; - $arr['body'] = '[url=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' + $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . '[img]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['scale'] . '[/img]' - . '[/url]'; + . '[/zrl]'; $item_id = item_store($arr); return $item_id; |