Changeset 2696

Timestamp:

07/03/08 18:02:38 (20 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.

Location:

branches/release-41

Files:

• lib/MT/Template/ContextHandlers.pm (modified) (2 diffs)
• t/35-tags.dat (modified) (1 diff)

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;
 }
 

branches/release-41/t/35-tags.dat

@@ -346 +346 @@
 { "r" : "1", "t" : "<MTEntries lastn=\"10\"><MTIfNonZero tag=\"MTEntryScoreCount\" namespace=\"unit test\"><MTEntryID> <MTEntryRank namespace=\"unit test\">; </MTIfNonZero></MTEntries>", "e" : "6 6; 5 1; 4 4; "}, #294
 { "r" : "1", "t" : "<MTEntries lastn=\"10\"><MTIfNonZero tag=\"MTEntryScoreCount\" namespace=\"unit test\"><MTEntryID> <MTEntryRank max=\"10\" namespace=\"unit test\">; </MTIfNonZero></MTEntries>", "e" : "6 10; 5 1; 4 5; "}, #295
-{ "r" : "1", "t" : "<MTEntries sort_by=\"score\" namespace=\"unit test\"><MTEntryID>; </MTEntries>", "e" : "5; 4; 6; 8; 1; 7; "}, #296
+{ "r" : "1", "t" : "<MTEntries glue=\"; \" sort_by=\"score\" namespace=\"unit test\" min_score=\"1\"><MTEntryID>-<MTEntryScore namespace=\"unit test\"></MTEntries>", "e" : "5-12; 4-5; 6-2"}, #296
 { "r" : "1", "t" : "<MTAssets lastn=\"10\"><MTIfNonZero tag=\"MTAssetScoreCount\" namespace=\"unit test\"><MTAssetID> <MTAssetScore namespace=\"unit test\">; </MTIfNonZero></MTAssets>", "e" : "1 12; 2 5; "}, #297
 { "r" : "1", "t" : "<MTAssets lastn=\"10\"><MTIfNonZero tag=\"MTAssetScoreCount\" namespace=\"unit test\"><MTAssetID> <MTAssetScoreHigh namespace=\"unit test\">; </MTIfNonZero></MTAssets>", "e" : "1 5; 2 3; "}, #298