Index: /branches/release-40/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-40/lib/MT/Template/ContextHandlers.pm (revision 2557)
+++ /branches/release-40/lib/MT/Template/ContextHandlers.pm (revision 2563)
@@ -14043,5 +14043,5 @@
 
         require MT::ObjectAsset;
-        my @assets = MT::Asset->load(undef, { join => MT::ObjectAsset->join_on(undef, {
+        my @assets = MT::Asset->load({ class => '*' }, { join => MT::ObjectAsset->join_on(undef, {
             asset_id => \'= asset_id', object_ds => 'entry', object_id => $e->id })});
         return '' unless @assets;
Index: /branches/release-40/t/35-tags.dat
===================================================================
--- /branches/release-40/t/35-tags.dat (revision 2530)
+++ /branches/release-40/t/35-tags.dat (revision 2563)
@@ -406,5 +406,5 @@
 { "r" : "1", "t" : "<MTAuthors sort_by='display_name' sort_order='descend'><MTAuthorID>;</MTAuthors>", "e" : "3;2;"}, #354
 { "r" : "1", "t" : "<MTArchives><MTArchiveLabel></MTArchives>", "e" : "EntryMonthlyWeeklyDailyCategoryPage"}, #355
-{ "r" : "1", "t" : "<MTEntries><$MTEntryID$>:<MTComments><MTIfCommenterIsAuthor><MTIfCommenterIsEntryAuthor>2<MTElse>1</MTIfCommenterIsEntryAuthor><MTElse>0</MTIfCommenterIsAuthor>;</MTComments></MTEntries>", "e" : "1:0;0;0;8:0;7:6:1;2;0;5:0;4:"}, #356
+{ "r" : "1", "t" : "<MTEntries><$MTEntryID$>:<MTComments><MTIfCommenterIsAuthor><MTIfCommenterIsEntryAuthor>2<MTElse>1</MTIfCommenterIsEntryAuthor><MTElse>0</MTIfCommenterIsAuthor>;</MTComments></MTEntries>", "e" : "1:0;0;0;8:0;7:6:2;1;0;5:0;4:"}, #356
 { "r" : "1", "t" : "<MTPages id='20'><$MTPageMore$></MTPages>", "e" : "<p>I don't have much to say,</p>"}, #357
 { "r" : "1", "t" : "<MTAssets lastn='1'><$MTAssetlabel$></MTAssets>", "e" : "Image photo"}, #358
Index: /branches/release-40/t/lib/MT/Test.pm
===================================================================
--- /branches/release-40/t/lib/MT/Test.pm (revision 2530)
+++ /branches/release-40/t/lib/MT/Test.pm (revision 2563)
@@ -37,5 +37,5 @@
 our $CORE_TIME;
 BEGIN {
-    *CORE::GLOBAL::time  = sub { CORE::time };
+    *CORE::GLOBAL::time  = sub { my ($a) = @_; $a ? CORE::time + $_[0] : CORE::time };
     *CORE::GLOBAL::sleep = sub { CORE::sleep };
 }
@@ -595,4 +595,5 @@
         $cmt->commenter_id($chuckd->id);
         $cmt->visible(1);
+        $cmt->created_on('20040910183000');
         $cmt->id(14);
         $cmt->save or die "Couldn't save comment record 1: ".$cmt->errstr;
@@ -601,4 +602,5 @@
         $cmt->commenter_id($bobd->id);
         $cmt->visible(1);
+        $cmt->created_on('20040910182800');
         $cmt->id(15);
         $cmt->save or die "Couldn't save comment record 1: ".$cmt->errstr;