From: Alan Date: Tue, 28 Jun 2022 05:54:20 +0000 (+0800) Subject: kludgy fix to uploading image/jpg X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=6c16407a1467c6234accc4916b35eb7256349180 kludgy fix to uploading image/jpg --- diff --git a/DataObjects/Images.php b/DataObjects/Images.php index f2c39c35..58e10a71 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -858,6 +858,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $this->mimetype = strtolower($this->mimetype); + if ($this->mimetype == 'image/jpg') { + $this->mimetype = 'image/jpeg'; + } + $explode_mimetype = explode('/', $this->mimetype); diff --git a/Images.php b/Images.php index 32859e1a..eff84f5c 100644 --- a/Images.php +++ b/Images.php @@ -85,7 +85,7 @@ class Pman_Core_Images extends Pman //if (!empty($_GET['_post'])) { // return $this->post(); //} - + $this->is_local = (!empty($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] == 'localhost') ? true : false; $this->as_mimetype = empty($_REQUEST['as']) ? '' : $_REQUEST['as']; @@ -283,7 +283,6 @@ class Pman_Core_Images extends Pman function serve($img) { $this->sessionState(0); // turn off session... - locking... - require_once 'File/Convert.php'; if (!file_exists($img->getStoreName())) { // print_r($img);exit;