Changeset 952

Timestamp:

12/19/06 20:54:25 (2 years ago)

Author:

gboggs

Message:

- Replaced nested, duplicate code with a single statement.
- Fixed the syntax of an errant sprintf().
BugId: 46014

Files:

• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (4 diffs)

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

@@ -124 +124 @@
-    }
-
+    my $dimensions = sprintf('width="%s" height="%s"', ($thumb
+        ? ($thumb->image_width, $thumb->image_height)
+        : ($asset->image_width, $asset->image_height)));
+
-    if ($param->{popup}) {
-        my $dimensions = '';
-        if ($thumb->image_width && $thumb->image_height) {
-            $dimensions = sprintf('width="%s" height="%s"',
-                $thumb->image_width, $thumb->image_height);
-        }
-        my $link = $thumb
-            ? sprintf('<img src="%s" %s alt="%s" />',
@@ -147 +146 @@
-            ? 'class="display_img_' . $param->{align} . '" ' : '';
-        if ($param->{thumb}) {
-            my $dimensions = '';
-            if ($thumb->image_width && $thumb->image_height) {
-                $dimensions = sprintf('width="%s" height="%s"',
-                    $thumb->image_width, $thumb->image_height);
-            }
-            $text = sprintf(
-                '<a href="%s"><img alt="%s" src="%s" %s %s/></a>',
@@ -160 +154 @@
-            );
-        } else {
-            my $dimensions = '';
-            if ($asset->image_width && $asset->image_height) {
-                $dimensions = sprintf('width="%s" height="%s"',
-                    $asset->image_width, $asset->image_height);
-            }
-            $text = sprintf(
-                '<img alt="%s" src="%s" %s %s/>',
@@ -173 +162 @@
-        }
-    } else {
-
-
+
-            MT::Util::encode_html($asset->url),
+            MT->translate('Download file'),
-        );
-    }