Changeset 969

Timestamp:

12/21/06 01:47:02 (2 years ago)

Author:

bchoate

Message:

Fixed filename in url for assets of overwritten files.

Files:

• branches/wheeljack/lib/MT/Asset.pm (modified) (1 diff)
• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (5 diffs)

branches/wheeljack/lib/MT/Asset.pm

@@ -281 +281 @@
-    if (my $blog = $asset->blog) {
-        require File::Basename;
-
+ 
-            my $file = File::Basename::basename($thumbnail_file);
-            my $site_url = $blog->site_url;

branches/wheeljack/lib/MT/Asset/Image.pm

@@ -150 +150 @@
-
-    if ($param->{popup}) {
+        my $popup = MT::Asset->load($param->{popup_asset_id}) ||
+            return $asset->error(
+                MT->translate("Can't load asset #[_1]",
+                    $param->{popup_asset_id})
+            );
-        my $link = $thumb
-            ? sprintf('<img src="%s" %s alt="%s" />',
@@ -159 +164 @@
-        $text = sprintf(
-            q|<a href="%s" onclick="window.open('%s','popup','width=%d,height=%d,scrollbars=no,resizable=no,toolbar=no,directories=no,location=no,menubar=no,status=no,left=0,top=0'); return false">%s</a>|,
-asset
-asset
+popup
+popup
-            $asset->image_width, $asset->image_height, $link,
-        );
@@ -295 +300 @@
-        my $i = 0;
-        while ($fmgr->exists($t_file)) {
-
+
+
-        }
-        $fmgr->put_data($blob, $t_file, 'upload')
@@ -305 +311 @@
-        $url .= '/' unless $url =~ m!/$!;
-        $url .= $file;
- . '-thumb' . $ext
+name
-
-        my $img_pkg = MT::Asset->handler_for_file($t_file);
@@ -401 +407 @@
-            $asset_html->parent($asset->id);
-            $asset_html->save;
+
+            $param->{popup_asset_id} = $asset_html->id;
+
-            MT->run_callbacks('CMSPostSave.asset', $app, $asset_html, $original);
-