projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af03fd6
)
DataObjects/Images.php
author
Edward
<edward@roojs.com>
Thu, 4 Oct 2018 03:01:38 +0000
(11:01 +0800)
committer
Edward
<edward@roojs.com>
Thu, 4 Oct 2018 03:01:38 +0000
(11:01 +0800)
DataObjects/Images.php
patch
|
blob
|
history
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
4edf348
..
5884eab
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-843,9
+843,18
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
if(empty($scaleHeight)){
$height = $this->height * $scaleWidth / $this->width;
}
+ }
+
+ if(!empty($scaleHeight)){
+ $height = $scaleHeight;
+ if(empty($scaleWidth)){
+ $width = $this->width * $scaleHeight / $this->height;
+ }
}
+
+
$base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
return $base64;