Changeset 4916

Timestamp:

10/29/09 03:56:32 (4 weeks ago)

Author:

asawada

Message:

Skip applying theme element when validation result was false. bugzid:102865.

Location:

branches/greyhound/lib/MT

Files:

• Theme.pm (modified) (2 diffs)
• Theme/Element.pm (modified) (1 diff)

branches/greyhound/lib/MT/Theme.pm

@@ -287 +287 @@
             }
             else {
-                MT->log(
+                require MT::Log;
+                my $log = MT::Log->new;
+                $log->message(
                     MT->translate(
                         'An error occurred while applying element [_1]: [_2].',
@@ -293 +295 @@
                         $element->errstr,
                 ));
+                $log->blog_id($blog->id);
+                $log->author_id( MT->app->user->id );
+                $log->level(2);
+                $log->category('theme');
+                MT->log($log);
             }
         }

branches/greyhound/lib/MT/Theme/Element.pm

@@ -40 +40 @@
             MT->translate(
                 'Compatibility error occured while applying \'[_1]\': [_2].',
+                $self->{id},
+                $self->errstr,
+        ));
+    }
+    if ( !$self->validate($importer, $self->{theme}, $blog) ) {
+        return $self->error(
+            MT->translate(
+                'An Error occured while applying \'[_1]\': [_2].',
                 $self->{id},
                 $self->errstr,