From dfb8a1b2d410eb27a647b967d857207162fa6540 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 5 Aug 2015 21:42:00 -0700 Subject: photo album is decided in dav or attach modules now - don't set it in photos_upload --- include/photos.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/photos.php b/include/photos.php index dced14705..d36c75b5e 100644 --- a/include/photos.php +++ b/include/photos.php @@ -34,16 +34,16 @@ function photo_upload($channel, $observer, $args) { */ $album = $args['album']; - $newalbum = $args['newalbum']; +// $newalbum = $args['newalbum']; - logger('photo_upload: album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG); +// logger('photo_upload: album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG); - if(! $album) { - if($newalbum) - $album = $newalbum; - else - $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y-m'); - } +// if(! $album) { +// if($newalbum) +// $album = $newalbum; +// else +// $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y-m'); +// } if(intval($args['visible']) || $args['visible'] === 'true') $visible = 1; -- cgit v1.2.3