Changeset 3082 for trunk/lib/MT/Tag.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/Tag.pm (modified) (2 diffs)

trunk/lib/MT/Tag.pm

@@ -176 +176 @@
         object_datasource => $datasource
     }, { unique => 1, %jargs });
-    my @tags = MT::Tag->load($terms, $args);
+    my @tags;
+    my $iter = MT::Tag->load_iter($terms, $args);
+    while ( my $tag = $iter->() ) {
+        push @tags, $tag;
+    }
     @tags;
 }
@@ -335 +339 @@
     } else {
         require MT::ObjectTag;
-        @tags = MT::Tag->search(undef, {  
+        my $iter = MT::Tag->load_iter(undef, {
             sort => 'name',  
             join => [ 'MT::ObjectTag', 'tag_id', { object_id => $obj->id,
                 object_datasource => $obj->datasource }, { unique => 1 } ],       
         });
+        while ( my $tag = $iter->() ) {
+            push @tags, $tag;
+        }
         $cache->set($memkey, [ map { $_->id } @tags ], TAG_CACHE_TIME);
     }