diff options
| author | Wave <wave72@users.noreply.github.com> | 2015-11-06 09:09:58 +0100 |
|---|---|---|
| committer | Wave <wave72@users.noreply.github.com> | 2015-11-06 09:09:58 +0100 |
| commit | 30d083ac3cbdf36171cfee7b892271b9b587325c (patch) | |
| tree | f2f63728f86f8336330d31ee8edf2fcd742dc71e /mod/photos.php | |
| parent | 50cf095c000813d0b1408d929c1fa7422b131a3d (diff) | |
| parent | 4ca0c2cfd14df5e2b6e9c7f59a10628f7653d6a4 (diff) | |
| download | volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.gz volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.bz2 volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.zip | |
Merge pull request #2 from redmatrix/master
Update to latest hubzilla
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mod/photos.php b/mod/photos.php index 0442a5d24..33a895fdf 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -183,17 +183,14 @@ function photos_post(&$a) { ); if($r) { - - /* this happens in attach_delete +/* q("DELETE FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'", intval($page_owner_uid), dbesc($r[0]['resource_id']) ); - */ - +*/ attach_delete($page_owner_uid, $r[0]['resource_id'], 1 ); - - /* this happens in attach_delete +/* $i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND resource_type = 'photo' and `uid` = %d LIMIT 1", dbesc($r[0]['resource_id']), intval($page_owner_uid) @@ -202,7 +199,7 @@ function photos_post(&$a) { drop_item($i[0]['id'],true,DROPITEM_PHASE1); $url = $a->get_baseurl(); } - */ +*/ } goaway($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']); @@ -626,7 +623,9 @@ function photos_content(&$a) { '$nickname' => $a->data['channel']['channel_address'], '$newalbum_label' => t('Enter an album name'), '$newalbum_placeholder' => t('or select an existing album (doubleclick)'), - '$visible' => array('visible', t('Create a status post for this upload'), 0, '', array(t('No'), t('Yes'))), + '$visible' => array('visible', t('Create a status post for this upload'), 0,'', array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'), + '$caption' => array('description', t('Caption (optional):')), + '$body' => array('body', t('Description (optional):'),'', 'Description will only appear in the status post'), '$albums' => $albums['albums'], '$selname' => $selname, '$permissions' => t('Permissions'), |