diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-08 02:00:00 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-08 02:00:00 -0700 |
| commit | 2e531c103f33e798d979bd9dcda168cc6cb5d3e0 (patch) | |
| tree | 8af1987d4ee21d61b7d4f8725fb27b0b1a5f1191 /Zotlabs | |
| parent | 1a05939e0bde75d251612c10e49aa7a3b61de64c (diff) | |
| download | volse-hubzilla-2e531c103f33e798d979bd9dcda168cc6cb5d3e0.tar.gz volse-hubzilla-2e531c103f33e798d979bd9dcda168cc6cb5d3e0.tar.bz2 volse-hubzilla-2e531c103f33e798d979bd9dcda168cc6cb5d3e0.zip | |
error
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Photo.php | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 56a9691bc..0e7284793 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -425,12 +425,6 @@ class Notifier { 'hash' => $d['xchan_hash'] ]; } - - if($d['xchan_network'] === 'mail' && $normal_mode) { - $delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode'); - if(! $delivery_options) - format_and_send_email($channel,$d,$target_item); - } } } diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 8963480e6..8a110f925 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -159,7 +159,7 @@ class Photo extends \Zotlabs\Web\Controller { if($r && intval($r[0]['photo_usage']) === PHOTO_COVER && $resolution >= PHOTO_RES_COVER_1200) $allowed = 1; - $d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r[0], 'allowed' => $allowed ]; + $d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r, 'allowed' => $allowed ]; call_hooks('get_photo',$d); $resolution = $d['imgscale']; |