Changeset 3082 for trunk/lib/MT/Template/ContextHandlers.pm

Timestamp:

10/03/08 01:07:01 (14 months ago)

Author:

bchoate

Message:

Merging fireball branch changes to-date to trunk: svn merge -r2974:3081 http://code.sixapart.com/svn/movabletype/branches/fireball .

Files:

• trunk/lib/MT/Template/ContextHandlers.pm (modified) (5 diffs)

trunk/lib/MT/Template/ContextHandlers.pm

@@ -721 +721 @@
 sub _fltr_setvar {
     my ($str, $arg, $ctx) = @_;
-    $ctx->var($arg, $str);
+    if ( my $hash = $ctx->{__inside_set_hashvar} ) {
+        $hash->{$arg} = $str;
+    }
+    else {
+        $ctx->var($arg, $str);
+    }
     return '';
 }
@@ -10144 +10149 @@
     unless (ref $blog) {
         my $blog_id = $blog || $args->{offset_blog_id};
-        if ($blog) {
+        if ($blog_id) {
             $blog = MT->model('blog')->load($blog_id);
             return $ctx->error( MT->translate( 'Can\'t load blog #[_1].', $blog_id ) )
@@ -10155 +10160 @@
         my($y, $mo, $d, $h, $m, $s) = $ts =~ /(\d\d\d\d)[^\d]?(\d\d)[^\d]?(\d\d)[^\d]?(\d\d)[^\d]?(\d\d)[^\d]?(\d\d)/;
         $mo--;
-        my $server_offset = $blog->server_offset;
+        my $server_offset = ($blog && $blog->server_offset) || MT->config->TimeOffset;
         if ((localtime (timelocal ($s, $m, $h, $d, $mo, $y )))[8]) {
             $server_offset += 1;
@@ -10173 +10178 @@
         my $tz = 'Z';
         unless ($args->{utc}) {
-            my $so = $blog->server_offset;
+            my $so = ($blog && $blog->server_offset) || MT->config->TimeOffset;
             my $partial_hour_offset = 60 * abs($so - int($so));
             if ($format eq 'rfc822') {
@@ -15948 +15953 @@
     if (my $ext = $args->{file_ext}) {
         my @exts = split(',', $args->{file_ext});
-        if (!$assets) {
+        if ($assets) {
             push @filters, sub { my $a = $_[0]->file_ext; grep(m/$a/, @exts) };
         } else {