diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-01-23 17:26:37 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-01-23 17:26:37 -0800 |
| commit | 0405f2bcb973118e6567fd44a7994aa06f54fe7a (patch) | |
| tree | 8926d35b5168111ab3f80d517ed97bce660181b1 /include/photos.php | |
| parent | 891d231bbe4ee4499cf9e62013971b85a0542404 (diff) | |
| parent | be9fc16bd5833e58ba2c3e5ed19153548437fe45 (diff) | |
| download | volse-hubzilla-0405f2bcb973118e6567fd44a7994aa06f54fe7a.tar.gz volse-hubzilla-0405f2bcb973118e6567fd44a7994aa06f54fe7a.tar.bz2 volse-hubzilla-0405f2bcb973118e6567fd44a7994aa06f54fe7a.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/photos.php')
| -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]'; |