Changeset 3082 for trunk/php/lib/MTUtil.php

Timestamp:

10/03/08 01:07:01 (14 months ago)

Author:

bchoate

Message:

Merging fireball branch changes to-date to trunk: svn merge -r2974:3081 http://code.sixapart.com/svn/movabletype/branches/fireball .

Files:

• trunk/php/lib/MTUtil.php (modified) (6 diffs)

trunk/php/lib/MTUtil.php

@@ -1301 +1301 @@
     $dest;
     $thumb_name = $static_file_path.DIRECTORY_SEPARATOR.$image_path.DIRECTORY_SEPARATOR.$format;
-    if (!$thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $scale, $thumb_name, 'png')) {
+    if (!$thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $asset['asset_id'], $scale, $thumb_name, 'png')) {
         return '';
     }
@@ -1314 +1314 @@
 
 # for compatibility...
-function make_thumbnail_file($src, $dest, $width, $height, $scale = 0, $dest_type = 'auto') {
+function make_thumbnail_file($src, $dest, $width, $height, $scale = 0, $dest_type = 'auto', $id = 0) {
     require_once('thumbnail_lib.php');
     $thumb = new Thumbnail($src);
@@ -1320 +1320 @@
     $thumb_w = $width;
     $thumb_h = $height;
-    $thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $scale, null, $dest_type);
+    $thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $id, $scale, null, $dest_type);
 
     return array($thumb_w, $thumb_h);
 }
 
-function get_thumbnail_file($asset, $blog, $width = 0, $height = 0, $scale = 0, $format = '%f-thumb-%wx%h%x') {
+function get_thumbnail_file($asset, $blog, $width = 0, $height = 0, $scale = 0, $format = '%f-thumb-%wx%h-%i%x') {
     # Get parameter
     $site_path = $blog['blog_site_path'];
@@ -1338 +1338 @@
     $ts = preg_replace('![^0-9]!', '', $asset['asset_created_on']);
     $date_stamp = format_ts('%Y/%m', $ts, $blog);
-    $cache_dir = $site_path . DIRECTORY_SEPARATOR . $cache_path . DIRECTORY_SEPARATOR . $date_stamp . DIRECTORY_SEPARATOR;
+    $base_path = $site_path;
+    if (preg_match('/^%a/', $asset['asset_file_path']) && !empty($blog['blog_archive_path'])) {
+        $base_path = $blog['blog_archive_path'];
+        $base_path = preg_replace('/\/$/', '', $base_path);
+    }
+
+    $cache_dir = $base_path . DIRECTORY_SEPARATOR . $cache_path . DIRECTORY_SEPARATOR . $date_stamp . DIRECTORY_SEPARATOR;
     $thumb_name = $cache_dir . $format;
- 
+
     # generate thumbnail
     require_once('thumbnail_lib.php');
@@ -1347 +1353 @@
     $thumb_h = $height;
     $dest;
-    if (!$thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $scale, $thumb_name)) {
+    if (!$thumb->get_thumbnail($dest, $thumb_w, $thumb_h, $asset['asset_id'], $scale, $thumb_name)) {
         return '';
     }
@@ -1353 +1359 @@
     # make url
     $basename = basename($dest);
-    $site_url = $blog['blog_site_url'];
-    if (!preg_match('!/$!', $site_url))
-        $site_url .= '/';
-
-    $thumb_url = $site_url . $cache_path . '/' . $date_stamp . '/' . $basename;
+    $base_url = $blog['blog_site_url'];
+    if (preg_match('/^%a/', $asset['asset_file_path']) && !empty($blog['blog_archive_url']))
+        $base_url = $blog['blog_archive_url'];
+    if (!preg_match('!/$!', $base_url))
+        $base_url .= '/';
+
+    $thumb_url = $base_url . $cache_path . '/' . $date_stamp . '/' . $basename;
 
     return array($thumb_url, $thumb_w, $thumb_h, $thumb_name);