diff options
| author | marijus <mario@mariovavti.com> | 2015-01-23 14:51:15 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2015-01-23 14:51:15 +0100 |
| commit | 884d542d4b9b4b1c3b141933e2bb464ad98abbb7 (patch) | |
| tree | 068363c54ba15e686427b25dd9eebf20b926a14e /include | |
| parent | 8789c96e78734cbc5420404eff149e514fe17ee7 (diff) | |
| parent | 7cd4374e3d2833725beeb1c3b65687dc0856619c (diff) | |
| download | volse-hubzilla-884d542d4b9b4b1c3b141933e2bb464ad98abbb7.tar.gz volse-hubzilla-884d542d4b9b4b1c3b141933e2bb464ad98abbb7.tar.bz2 volse-hubzilla-884d542d4b9b4b1c3b141933e2bb464ad98abbb7.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include')
| -rw-r--r-- | include/photos.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/photos.php b/include/photos.php index 2393153c6..2e5e22968 100644 --- a/include/photos.php +++ b/include/photos.php @@ -256,6 +256,15 @@ function photo_upload($channel, $observer, $args) { else $tag = '[zmg]'; + $preferred = intval(get_pconfig($channel['channel_id'],'system','post_photores')); + if($preferred == 1) { + $tag = '[zmg]'; + if($r2) + $smallest = 1; + else + $smallest = 0; + } + $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . $tag . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' . '[/zrl]'; |