Bug 65996

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@828 6955db30-a419-402b-8a0d-67ecbb4d7f56

Bugzilla/Search.pm

@@ -37,7 +37,6 @@ use base qw(Exporter);
 @Bugzilla::Search::EXPORT = qw(
     EMPTY_COLUMN
 
-    IsValidQueryType
     split_order_term
     translate_old_column
 );
@@ -50,7 +49,6 @@ use Bugzilla::User;
 use Bugzilla::Field;
 use Bugzilla::Status;
 use Bugzilla::Keyword;
-use Bugzilla::Search::Saved;
 
 use Date::Format;
 use Date::Parse;
@@ -1208,16 +1206,6 @@ sub pronoun {
     return 0;
 }
 
-# Validate that the query type is one we can deal with
-sub IsValidQueryType
-{
-    my ($queryType) = @_;
-    if (grep { $_ eq $queryType } qw(specific advanced)) {
-        return 1;
-    }
-    return 0;
-}
-
 # BuildOrderBy - Private Subroutine
 # This function converts the input order to an "output" order,
 # suitable for concatenation to form an ORDER BY clause. Basically,

Bugzilla/Search/Saved.pm

@@ -22,14 +22,15 @@ use strict;
 
 package Bugzilla::Search::Saved;
 
-use base qw(Bugzilla::Object);
+use base qw(Bugzilla::Object Exporter);
+
+our @EXPORT = qw(IsValidQueryType);
 
 use Bugzilla::CGI;
 use Bugzilla::Hook;
 use Bugzilla::Constants;
 use Bugzilla::Group;
 use Bugzilla::Error;
-use Bugzilla::Search qw(IsValidQueryType);
 use Bugzilla::User;
 use Bugzilla::Util;
 
@@ -301,6 +302,16 @@ sub set_name       { $_[0]->set('name',       $_[1]); }
 sub set_url        { $_[0]->set('query',      $_[1]); }
 sub set_query_type { $_[0]->set('query_type', $_[1]); }
 
+# Validate that the query type is one we can deal with
+sub IsValidQueryType
+{
+    my ($queryType) = @_;
+    if (grep { $_ eq $queryType } qw(specific advanced)) {
+        return 1;
+    }
+    return 0;
+}
+
 1;
 
 __END__

query.cgi

@@ -32,6 +32,7 @@ use Bugzilla;
 use Bugzilla::Bug;
 use Bugzilla::Constants;
 use Bugzilla::Search;
+use Bugzilla::Search::Saved;
 use Bugzilla::User;
 use Bugzilla::Util;
 use Bugzilla::Error;