oops

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 7a32e40..bc1dc1d 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -259,30 +259,40 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
      
     function toRooArray($req = array()) {
       //  echo '<PRE>';print_r($req);exit;
-        if (empty($req['query']['imagesize'])) {
-            return $this->toArray();
-        }
         $ret= $this->toArray();
-        
-        $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false;
-        
-        $ret['url'] = $this->URL(-1, '/Images/Download',$baseURL);
-        
-        $ret['url_view'] = $this->URL(-1, '/Images',$baseURL);    
-        
+      
+      
         if (!empty($req['query']['imagesize'])) {
-            $ret['url_thumb'] = $this->URL($req['query']['imagesize'], '/Images/Thumb',$baseURL);
+             $baseURL = isset($req['query']['imageBaseURL']) ? $req['query']['imageBaseURL'] : false;
+            
+            $ret['url'] = $this->URL(-1, '/Images/Download',$baseURL);
+            
+            $ret['url_view'] = $this->URL(-1, '/Images',$baseURL);    
+            
+            if (!empty($req['query']['imagesize'])) {
+                $ret['url_thumb'] = $this->URL($req['query']['imagesize'], '/Images/Thumb',$baseURL);
+            }
         }
+        
+         
          
         return $ret;
     }
-     
-    function URL($size, $provider = '/Images/Thumb', $baseURL=false)
+    
+    /**
+     * URL - create  a url for the image.
+     * size - use -1 to show full size.
+     * provier = baseURL + /Images/Thumb ... use '/Images/' for full
+     * 
+     * 
+     */
+    function URL($size , $provider = '/Images/Thumb', $baseURL=false)
     {
         if (!$this->id) {
             return 'about:blank';
             
         }
+
         $ff = HTML_FlexyFramework::get();
         $baseURL = $baseURL ? $baseURL : $ff->baseURL ;
         if ($size < 0) {