diff options
| author | friendica <info@friendica.com> | 2014-06-22 03:40:27 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-22 03:40:27 -0700 |
| commit | 301c7cdb89b13c4fc7c502795f121e13c1f9441d (patch) | |
| tree | ebfd175b59c84b42b84703d25f16295b91d2c6c6 /mod/photos.php | |
| parent | a0747799fcbec42862333611026baccfc8bcacdc (diff) | |
| parent | 729645e80e72d6f5bb90c9e8e03e7ffa4e17e894 (diff) | |
| download | volse-hubzilla-301c7cdb89b13c4fc7c502795f121e13c1f9441d.tar.gz volse-hubzilla-301c7cdb89b13c4fc7c502795f121e13c1f9441d.tar.bz2 volse-hubzilla-301c7cdb89b13c4fc7c502795f121e13c1f9441d.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mod/photos.php b/mod/photos.php index 8c168c21d..c43beb8d4 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -927,6 +927,10 @@ function photos_content(&$a) { $edit = null; if($can_post) { + if(array_key_exists('albums', $a->data)) + $albums = get_app()->data['albums']; + else + $albums = photos_albums_list($a->data['channel'],$a->data['observer']); $album_e = $ph[0]['album']; $caption_e = $ph[0]['description']; @@ -937,6 +941,7 @@ function photos_content(&$a) { 'id' => $ph[0]['id'], 'rotatecw' => t('Rotate CW (right)'), 'rotateccw' => t('Rotate CCW (left)'), + 'albums' => $albums['albums'], 'album' => $album_e, 'newalbum' => t('New album name'), 'nickname' => $a->data['channel']['channel_address'], |