projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77efaf0
)
DataObjects/Images.php
author
Alan Knowles
<alan@roojs.com>
Fri, 24 Jun 2016 04:39:14 +0000
(12:39 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 24 Jun 2016 04:39:14 +0000
(12:39 +0800)
DataObjects/Images.php
patch
|
blob
|
history
diff --git
a/DataObjects/Images.php
b/DataObjects/Images.php
index
53bfc77
..
cc3ba19
100644
(file)
--- a/
DataObjects/Images.php
+++ b/
DataObjects/Images.php
@@
-403,7
+403,7
@@
class Pman_Core_DataObjects_Images extends DB_DataObject
$ff->Pman_Images['public_baseURL'] : $ff->baseURL;
if (!empty($req['query']['imagesize'])) {
$ff->Pman_Images['public_baseURL'] : $ff->baseURL;
if (!empty($req['query']['imagesize'])) {
-
$baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false
;
+
$baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : $ret['public_baseURL']
;
$ret['url'] = $this->URL(-1, '/Images/Download',$baseURL);
$ret['url'] = $this->URL(-1, '/Images/Download',$baseURL);