harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix photos/upload album selector

Browse Source
This commit is contained in:
friendica 2014-01-06 02:54:08 -08:00
parent a3161a8cd6
commit 323fc1f9a5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/photos.php
View File

@ -647,12 +647,21 @@ function photos_content(&$a) {
return; return;
} }
if(array_key_exists('albums', $a->data))
$albums = get_app()->data['albums'];
else
$albums = photos_albums_list($a->data['channel'],$a->data['observer']);
$selname = (($datum) ? hex2bin($datum) : ''); $selname = (($datum) ? hex2bin($datum) : '');
$albumselect = '<select id="photos-upload-album-select" name="album" size="4">'; $albumselect = '<select id="photos-upload-album-select" name="album" size="4">';
$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>'; $albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
if(count($a->data['albums'])) { if(count($albums)) {
foreach($a->data['albums'] as $album) { foreach($albums as $album) {
if($album['text'] === '') if($album['text'] === '')
continue; continue;
$selected = (($selname === $album['text']) ? ' selected="selected" ' : ''); $selected = (($selname === $album['text']) ? ' selected="selected" ' : '');