projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
481f2f7
)
Images.php
author
Alan Knowles
<alan@roojs.com>
Mon, 23 Jul 2012 07:36:04 +0000
(15:36 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 23 Jul 2012 07:36:04 +0000
(15:36 +0800)
Images.php
patch
|
blob
|
history
diff --git
a/Images.php
b/Images.php
index
eb1efd0
..
09d35dc
100644
(file)
--- a/
Images.php
+++ b/
Images.php
@@
-170,7
+170,11
@@
class Pman_Core_Images extends Pman
require_once 'File/Convert.php';
$cv = new File_Convert($tmp, $this->mimetype);
- $cv->convert($this->as_mimetype);
+ $fn = $cv->convert($this->as_mimetype);
+ if (!empty($_REQUEST['as_data'])) {
+ $this->jok(base64_encode(file_get_contents($fn)));
+ }
+
$cv->serve('attachment');
exit;