Changeset 13221

Timestamp:

Jan 2, 2010, 4:44:11 AM (13 years ago)

Author:

ebihara

Message:

[sfImageHandlerPlugin] fixed issue the sf_image_path() always display JPEG image

File:

• OpenPNE3/plugins/sfImageHandlerPlugin/trunk/lib/helper/sfImageHelper.php (modified) (2 diffs)

OpenPNE3/plugins/sfImageHandlerPlugin/trunk/lib/helper/sfImageHelper.php

@@ -60 +60 @@
     unset($options['f']);
   }
+ elseif (is_callable(array($filename, 'getType')))
+  {
+    $f = str_replace('image/', '', $filename->getType());
+  }
   else
   {
-    $parts = explode('.', $filename);
+    $parts = explode('_', $filename);
     $f = array_pop($parts);
-    if ($f !== 'jpg' || $f !== 'png' || $f !== 'gif')
-    {
-      $f = 'jpg';
-    }
+  }
+
+  if ($f !== 'jpg' && $f !== 'png' && $f !== 'gif')
+  {
+    $f = 'jpg';
   }
 
@@ -78 +83 @@
   }
 
-  $filepath = 'img/'.$f.'/'.$size_dir_name.'/'.$filename;
+  $filepath = 'img/'.$f.'/'.$size_dir_name.'/'.$filename.'.'.$f;
   $options['raw_name'] = true;
   return _compute_public_path($filepath, 'cache', $f, $absolute);