Changeset 1971

Timestamp:

04/18/08 02:34:26 (4 months ago)

Author:

takayama

Message:

Fixed BugId:75137
* Keep compatibility of attribute name
* added tests

Files:

• branches/release-35/lib/MT/Blog.pm (modified) (1 diff)
• branches/release-35/lib/MT/Template/ContextHandlers.pm (modified) (2 diffs)
• branches/release-35/t/65-ssi.t (modified) (1 diff)

branches/release-35/lib/MT/Blog.pm

@@ -385 +385 @@
-    my $path = $param->{path} || '';
-    my @path;
-m!^/
+s!^/!
-        # absolute
-/\//
+q{/}
-    } else {
-        # relative
-        push @path, MT->config('IncludesDir');
-/\//
+q{/}
-    }
-    return ($filename, @path);

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

@@ -2370 +2370 @@
-            $use_ssi = 0;
-        } else {
-$arg->{cache_key} ? $arg->{cache_
+($arg->{cache_key} || $arg->{key}) ? $arg->{cache_key} || $arg->{
-                : $tmpl->cache_path ? $tmpl->cache_path
-                    : '';
@@ -2387 +2387 @@
-      && ( ( $arg->{cache} && $arg->{cache} > 0 )
-        || $arg->{cache_key}
+        || $arg->{key}
-        || ( exists $arg->{ttl} )
-        || $tmpl->use_cache ) ? 1 : 0;
-    my $cache_key =
-$arg->{cache_key}
-
+($arg->{cache_key} || $arg->{key})
+ || $arg->{key}
-      : 'blog::' . $blog_id . '::template_' . $type . '::' . $tmpl_name;
-    my $ttl =

branches/release-35/t/65-ssi.t

@@ -105 +105 @@
-    'test template included template by ssi');
-
+$tmpl = MT->model('template')->new;
+$tmpl->blog_id($blog->id);
+$tmpl->text(q(hi <mt:include module="Included Template" key="w" ttl="1000" ssi="1"> bye));
+
+$ctx = MT::Template::Context->new;
+$ctx->{__stash}{vars}{woot} = 'terrible';
+$out = $tmpl->build($ctx, {});
+
+ok(defined $out, 'test template built');
+$site_url = $blog->site_url;
+$site_url =~ s{ \A \w+ :// [^/]+ }{}xms;
+$site_url =~ s{ / \z }{}xms;
+like($out, qr(\Ahi <!--#include virtual="${site_url}/includes_c/w/included_template.html" --> bye\z)ms,
+    'test template included template by ssi using \'key\' with relative path');
+
+
+$tmpl = MT->model('template')->new;
+$tmpl->blog_id($blog->id);
+$tmpl->text(q(hi <mt:include module="Included Template" ttl="1000" ssi="1"> bye));
+
+$ctx = MT::Template::Context->new;
+$ctx->{__stash}{vars}{woot} = 'terrible';
+$out = $tmpl->build($ctx, {});
+
+ok(defined $out, 'test template built');
+$site_url = $blog->site_url;
+$site_url =~ s{ \A \w+ :// [^/]+ }{}xms;
+$site_url =~ s{ / \z }{}xms;
+like($out, qr(\Ahi <!--#include virtual="${site_url}/includes_c/included_template.html" --> bye\z)ms,
+    'test template included template by ssi without \'key\'');
+
+
+$tmpl = MT->model('template')->new;
+$tmpl->blog_id($blog->id);
+$tmpl->text(q(hi <mt:include module="Included Template" cache_key="/w" ttl="1000" ssi="1"> bye));
+
+$ctx = MT::Template::Context->new;
+$ctx->{__stash}{vars}{woot} = 'terrible';
+$out = $tmpl->build($ctx, {});
+
+ok(defined $out, 'test template built');
+$site_url = $blog->site_url;
+$site_url =~ s{ \A \w+ :// [^/]+ }{}xms;
+$site_url =~ s{ / \z }{}xms;
+like($out, qr(\Ahi <!--#include virtual="${site_url}/w/included_template.html" --> bye\z)ms,
+    'test template included template by ssi with \'key\' absolute path');
+