diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/account.php | 2 | ||||
| -rw-r--r-- | include/photo/photo_driver.php | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/account.php b/include/account.php index 72d44d9ca..1572583c7 100644 --- a/include/account.php +++ b/include/account.php @@ -26,7 +26,7 @@ function check_account_email($email) { $r = q("select account_email from account where account_email = '%s' limit 1", dbesc($email) ); - if(count($r)) { + if($r) { $result['message'] .= t('Your email address is already registered at this site.'); } } diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index 27237c530..25f53f400 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -378,6 +378,7 @@ function guess_image_type($filename, $fromcurl=false) { $type = $headers['Content-Type']; } if (is_null($type)){ +// FIXME!!!! // Guessing from extension? Isn't that... dangerous? if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) { /** @@ -389,7 +390,8 @@ function guess_image_type($filename, $fromcurl=false) { $type = $image->getImageMimeType(); } else { $ext = pathinfo($filename, PATHINFO_EXTENSION); - $types = Photo::supportedTypes(); + $ph = photo_factory(''); + $types = $ph->supportedTypes(); $type = "image/jpeg"; foreach ($types as $m=>$e){ if ($ext==$e) $type = $m; @@ -427,7 +429,7 @@ function import_profile_photo($photo,$xchan) { if($result['success']) $img_str = $result['body']; - $img = new Photo($img_str, $type); + $img = photo_factory($img_str, $type); if($img->is_valid()) { $img->scaleImageSquare(175); @@ -485,7 +487,7 @@ function import_channel_photo($photo,$type,$aid,$uid) { $filename = $hash; - $img = new Photo($photo, $type); + $img = photo_factory($photo, $type); if($img->is_valid()) { $img->scaleImageSquare(175); |