diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
| commit | d554681174084e1715dfae4c21af9f6edcbad59e (patch) | |
| tree | eb585cce4ebe24d663b2e7eab28a62da612efec1 /include/photo/photo_driver.php | |
| parent | e00b8a70829213a4333a53a097c2c498d529f5d6 (diff) | |
| parent | 551cf8ee9413c5c57e7b71d6016466e598636900 (diff) | |
| download | volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.gz volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.bz2 volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/photo/photo_driver.php')
| -rw-r--r-- | include/photo/photo_driver.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 3bea54fd4..e57a9165a 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -521,7 +521,7 @@ function guess_image_type($filename, $headers = '') { logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG); $type = null; if ($headers) { - $a = get_app(); + $hdrs=array(); $h = explode("\n",$headers); foreach ($h as $l) { @@ -580,8 +580,6 @@ function guess_image_type($filename, $headers = '') { function import_xchan_photo($photo,$xchan,$thing = false) { - $a = get_app(); - $flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN); $album = (($thing) ? 'Things' : 'Contact Photos'); @@ -703,8 +701,6 @@ function import_xchan_photo($photo,$xchan,$thing = false) { function import_channel_photo($photo,$type,$aid,$uid) { - $a = get_app(); - logger('import_channel_photo: importing channel photo for ' . $uid, LOGGER_DEBUG); $hash = photo_new_resource(); |