From c16b403cf7adf293a0c51d127d38d5794f9c2b36 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 18 Jun 2014 16:26:27 -0700
Subject: 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.

---
 mod/photos.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'mod')

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 = '';
-- 
cgit v1.2.3