projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Images.php
[Pman.Core]
/
DataObjects
/
Images.php
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
96b7c88
..
4c1b928
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-830,10
+830,6
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
$data = file_get_contents($file);
$data = file_get_contents($file);
- if($rotate){
- $data = $this->rotate();
- }
-
if(!empty($scaleWidth) || !empty($scaleHeight)){
$width = $this->width;
if(!empty($scaleWidth) || !empty($scaleHeight)){
$width = $this->width;
@@
-870,6
+866,10
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
}
}
+ if($rotate){
+ $data = $this->rotate($data);
+ }
+
$base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
return $base64;
$base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
return $base64;