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

cleanup only

Browse Source
This commit is contained in:
zotlabs 2017-05-31 22:59:07 -07:00
parent e6581aa09c
commit cdfcb1ed24
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/photo/photo_driver.php
View File

@ -252,11 +252,10 @@ abstract class photo_driver {
*/ */
if(! $this->is_valid()) if(! $this->is_valid())
return FALSE; return false;
if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg')) if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg'))
return; return false;
$exif = @exif_read_data($filename,null,true); $exif = @exif_read_data($filename,null,true);

14
include/photos.php
View File

@ -492,15 +492,15 @@ function photos_albums_list($channel, $observer, $sort_key = 'display_path', $di
$ret['success'] = true; $ret['success'] = true;
$ret['albums'] = array(); $ret['albums'] = array();
foreach($albums as $k => $album) { foreach($albums as $k => $album) {
$entry = array( $entry = [
'text' => (($album['album']) ? $album['album'] : '/'), 'text' => (($album['album']) ? $album['album'] : '/'),
'shorttext' => (($album['album']) ? ellipsify($album['album'],28) : '/'), 'shorttext' => (($album['album']) ? ellipsify($album['album'],28) : '/'),
'jstext' => (($album['album']) ? addslashes($album['album']) : '/'), 'jstext' => (($album['album']) ? addslashes($album['album']) : '/'),
'total' => $album['total'], 'total' => $album['total'],
'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'], 'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'],
'urlencode' => urlencode($album['album']), 'urlencode' => urlencode($album['album']),
'bin2hex' => $album['folder'] 'bin2hex' => $album['folder']
); ];
$ret['albums'][] = $entry; $ret['albums'][] = $entry;
} }
} }