Changeset 1555 for trunk

Timestamp:

06/15/09 19:38:36 (6 months ago)

Author:

mpaschal

Message:

Protect against some more cron-time warnings

Files:

• trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Event.pm (modified) (4 diffs)

trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Event.pm

@@ -385 +385 @@
                     or next VALUE;
 
-                $item_data{$key} = [ map { MT::I18N::utf8_off( $_->getNodeValue ) } @outvals ];
+                $item_data{$key} = [ grep map { MT::I18N::utf8_off( $_->getNodeValue ) } @outvals ];
             }
             else {
@@ -394 +394 @@
                 if ($outval && ($key eq 'created_on' || $key eq 'modified_on')) {
                     # try both RFC 822/1123 and ISO 8601 formats
-                    $outval = MT::Util::epoch2ts(undef, str2time($outval))
-                        || MT::Util::iso2ts(undef, $outval);
+                    my $out_timestamp;
+                    if (my $epoch = str2time($outval)) {
+                        $out_timestamp = MT::Util::epoch2ts(undef, $epoch);
+                    }
+                    # The epoch2ts may have failed too.
+                    if (!defined $out_timestamp) {
+                        $out_timestamp = MT::Util::iso2ts(undef, $outval);
+                    }
+                    # Whether it's defined or not, that's our new outval.
+                    $outval = $out_timestamp;
                 }
 
@@ -445 +453 @@
             %$item,
         });
-        $event->tags(@$tags) if $tags;
+        $event->tags(@$tags) if $tags && @$tags;
         if ($hide_timeless && !$event->created_on) {
             $event->visible(0);
@@ -497 +505 @@
                 $item->{$field} = [ map { MT::I18N::utf8_off( "$_" ) } @{ $item->{$field} } ];
             }
+            elsif (defined $item->{$field}) {
+                $item->{$field} = MT::I18N::utf8_off( q{} . $item->{$field} );
+            }
             else {
-                $item->{$field} = MT::I18N::utf8_off( q{} . $item->{$field} );
+                delete $item->{$field};
             }
         }