Changeset 2991 for trunk/lib/MT/App/Search.pm

Timestamp:

08/27/08 05:39:25 (15 months ago)

Author:

fumiakiy

Message:

Run through the process and do not return the error when search string was not specified to mt-search, to enable MTNoSearch tag again. BugId:81304

Files:

• trunk/lib/MT/App/Search.pm (modified) (2 diffs)

trunk/lib/MT/App/Search.pm

@@ -273 +273 @@
         return $out;
     }
-
-    my @arguments = $app->search_terms();
-    return $app->error( $app->errstr ) if $app->errstr;
-
-    $count = 0;
     my $iter;
-    if (@arguments) {
-        ( $count, $iter ) = $app->execute(@arguments);
-        return $app->error( $app->errstr ) unless $iter;
-
-        $app->run_callbacks( 'search_post_execute', $app, \$count, \$iter );
+    if ( $app->param('searchTerms') || $app->param('search') ) {
+        my @arguments = $app->search_terms();
+        return $app->error( $app->errstr ) if $app->errstr;
+
+        $count = 0;
+        if (@arguments) {
+            ( $count, $iter ) = $app->execute(@arguments);
+            return $app->error( $app->errstr ) unless $iter;
+
+            $app->run_callbacks( 'search_post_execute', $app, \$count, \$iter );
+        }
     }
 
@@ -345 +346 @@
     my $q   = $app->param;
 
-    my $search_string = $q->param('searchTerms') || $q->param('search')
-        or return $app->errtrans('No search term was specified.');
+    my $search_string = $q->param('searchTerms') || $q->param('search');
     $app->{search_string} = $search_string;
     my $offset = $q->param('startIndex') || $q->param('offset') || 0;