From cdfcb1ed24d950efa2a2054bec5267ecdae3fb68 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 22:59:07 -0700
Subject: cleanup only

---
 include/photo/photo_driver.php |  5 ++---
 include/photos.php             | 14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index cc1f3b5d0..0bf09e4d8 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -252,11 +252,10 @@ abstract class photo_driver {
 		 */
 
 		if(! $this->is_valid())
-			return FALSE;
-
+			return false;
 
 		if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg'))
-			return;
+			return false;
 
 		$exif = @exif_read_data($filename,null,true);
 
diff --git a/include/photos.php b/include/photos.php
index 896f3e1f2..c3260d18c 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -492,15 +492,15 @@ function photos_albums_list($channel, $observer, $sort_key = 'display_path', $di
 		$ret['success'] = true;
 		$ret['albums'] = array();
 		foreach($albums as $k => $album) {
-			$entry = array(
-				'text' => (($album['album']) ? $album['album'] : '/'),
+			$entry = [
+				'text'      => (($album['album']) ? $album['album'] : '/'),
 				'shorttext' => (($album['album']) ? ellipsify($album['album'],28) : '/'),
-				'jstext' => (($album['album']) ? addslashes($album['album']) : '/'),
-				'total' => $album['total'],
-				'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'],
+				'jstext'    => (($album['album']) ? addslashes($album['album']) : '/'),
+				'total'     => $album['total'],
+				'url'       => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'],
 				'urlencode' => urlencode($album['album']),
-				'bin2hex' => $album['folder']
-			);
+				'bin2hex'   => $album['folder']
+			];
 			$ret['albums'][] = $entry;
 		}
 	}
-- 
cgit v1.2.3