aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-18 16:26:27 -0700
committerfriendica <info@friendica.com>2014-06-18 16:26:27 -0700
commitc16b403cf7adf293a0c51d127d38d5794f9c2b36 (patch)
treea13ff3ba359a32df7e3c8e2a957b630e1f624304 /mod
parent80d84206ed9744ce033942d0379a97834a33b11c (diff)
downloadvolse-hubzilla-c16b403cf7adf293a0c51d127d38d5794f9c2b36.tar.gz
volse-hubzilla-c16b403cf7adf293a0c51d127d38d5794f9c2b36.tar.bz2
volse-hubzilla-c16b403cf7adf293a0c51d127d38d5794f9c2b36.zip
oh this is nice... http://kmkeen.com/jshon - this is what we need to make shred -- well "shred". I also had to change the photos album list API a bit to fix any imagined and/or real parsing issues and also fixed shred so it can find its auxiliary files.
Diffstat (limited to 'mod')
-rw-r--r--mod/photos.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/mod/photos.php b/mod/photos.php
index a3ca933b1..8c168c21d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -539,8 +539,8 @@ function photos_content(&$a) {
$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>';
- if(count($albums)) {
- foreach($albums as $album) {
+ if(count($albums['albums'])) {
+ foreach($albums['albums'] as $album) {
if(! $album['text'])
continue;
$selected = (($selname === $album['text']) ? ' selected="selected" ' : '');
@@ -548,8 +548,6 @@ function photos_content(&$a) {
}
}
- $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
$albumselect .= '</select>';
$uploader = '';