Changeset 2696 for branches/release-41/lib/MT/Template/ContextHandlers.pm

Timestamp:

07/03/08 18:02:38 (17 months ago)

Author:

bchoate

Message:

Fixed author/commenter icon urls to produce full URLs when static web path is relative (uses blog domain). Fixes the last two remaining tag suite test failures for perl.

Files:

• branches/release-41/lib/MT/Template/ContextHandlers.pm (modified) (2 diffs)

branches/release-41/lib/MT/Template/ContextHandlers.pm

@@ -6544 +6544 @@
     return $ctx->_no_author_error() unless $author;
     my $size = $args->{size} || 'logo_small';
-    return $author->auth_icon_url($size);
+    my $url = $author->auth_icon_url($size);
+    if ($url =~ m!^/!) {
+        # relative path, prepend blog domain
+        my $blog = $ctx->stash('blog');
+        if ($blog) {
+            my ($blog_domain) = $blog->archive_url =~ m|(.+://[^/]+)|;
+            $url = $blog_domain . $url;
+        }
+    }
+    return $url;
 }
 
@@ -11164 +11173 @@
     return q() unless $a;
     my $size = $args->{size} || 'logo_small';
-    return $a->auth_icon_url($size);
+    my $url = $a->auth_icon_url($size);
+    if ($url =~ m!^/!) {
+        # relative path, prepend blog domain
+        my $blog = $ctx->stash('blog');
+        if ($blog) {
+            my ($blog_domain) = $blog->archive_url =~ m|(.+://[^/]+)|;
+            $url = $blog_domain . $url;
+        }
+    }
+    return $url;
 }