Changeset 2202

Timestamp:

05/02/08 18:35:14 (23 months ago)

Author:

fumiakiy

Message:

Removed the reference to a private method in MT::Object from MT::OD::DBI. Use the trigger instead, just like other methods in it are doing. BugId:79569

Location:

branches/release-37/lib/MT

Files:

• Object.pm (modified) (2 diffs)
• ObjectDriver/Driver/DBI.pm (modified) (1 diff)

branches/release-37/lib/MT/Object.pm

@@ -275 +275 @@
         or return;
     if (ref $terms eq 'HASH') {
+        my $no_class = 0;
+        if ($args->{no_class}) {
+            delete $args->{no_class};
+            $no_class = 1;
+        }
         if (exists $terms->{$col}) {
-            if ($terms->{$col} eq '*') {
+            if ( ( $terms->{$col} eq '*' ) || $no_class ) {
                 # class term is '*', which signifies filtering for all classes.
                 # simply delete the term in this case.
@@ -289 +294 @@
             return;
         }
-        $terms->{$col} = $props->{class_type};
+        $terms->{$col} = $props->{class_type}
+            unless $no_class;
     }
     elsif (ref $terms eq 'ARRAY') {

branches/release-37/lib/MT/ObjectDriver/Driver/DBI.pm

@@ -122 +122 @@
     my ($agg_func, $class, $terms, $args) = @_;
     my $props = $class->properties;
-    if ($args->{no_class}) {
-        delete $terms->{$props->{class_column}};
-        delete $args->{no_class};
-    }
-    else {
-        $class->_pre_search_scope_terms_to_class( $terms, $args );
-    }
+    $class->call_trigger('pre_search', $terms, $args);
     my $order = delete $args->{sort};
     my $direction = delete $args->{direction};