DataObjects/core.sql

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 40e630f..86c1e77 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -348,7 +348,14 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
       //  echo '<PRE>';print_r($req);exit;
         $ret= $this->toArray();
       
-      
+        static $ff = false;
+        if (!$ff) {
+            $ff = HTML_FlexyFramework::get();
+        }
+        
+        $ret['public_baseURL'] = isset($ff->Pman_Images['public_baseURL']) ?
+                    $ff->Pman_Images['public_baseURL'] : $ff->baseURL;
+        
         if (!empty($req['query']['imagesize'])) {
              $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false;
             
@@ -385,7 +392,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if (preg_match('#^http[s]*://#', $provider)) {
             $baseURL = '';
         }
-        
+       
         if ($size < 0) {
             return $baseURL . $provider . "/{$this->id}/{$this->filename}";
         }
@@ -421,14 +428,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             $sy = $sz[1];
         }
         // create it?
-        
-        
+         
         return '<img src="' . $this->URL($size, $provider) . '" width="'. $sx . '" height="'. $sy . '">';
         
         
     }
-    
-    
+     
     /**
      * to Fileconvert object..
      *
@@ -441,7 +446,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         $fc = new File_Convert($this->getStoreName(), $this->mimetype);
         return $fc;
         
-        
     }
     /**
      *