rollback Bug 828344

2 files changed, 19 insertions, 21 deletions

diff --git a/Bugzilla/Search/Clause.pm b/Bugzilla/Search/Clause.pm
index 89210babb..38f6f30be 100644
--- a/Bugzilla/Search/Clause.pm
+++ b/Bugzilla/Search/Clause.pm
@@ -98,29 +98,25 @@ sub walk_conditions {
 
 sub as_string {
     my ($self) = @_;
-    if (!$self->{sql}) {
-        my @strings;
-        foreach my $child (@{ $self->children }) {
-            next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
-            next if $child->isa('Bugzilla::Search::Condition')
-                    && !$child->translated;
+    my @strings;
+    foreach my $child (@{ $self->children }) {
+        next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
+        next if $child->isa('Bugzilla::Search::Condition')
+                && !$child->translated;
 
-            my $string = $child->as_string;
-            next unless $string;
-            if ($self->joiner eq 'AND') {
-                $string = "( $string )" if $string =~ /OR/;
-            }
-            else {
-                $string = "( $string )" if $string =~ /AND/;
-            }
-            push(@strings, $string);
+        my $string = $child->as_string;
+        if ($self->joiner eq 'AND') {
+            $string = "( $string )" if $string =~ /OR/;
         }
-
-        my $sql = join(' ' . $self->joiner . ' ', @strings);
-        $sql = "NOT( $sql )" if $sql && $self->negate;
-        $self->{sql} = $sql;
+        else {
+            $string = "( $string )" if $string =~ /AND/;
+        }
+        push(@strings, $string);
     }
-    return $self->{sql};
+    
+    my $sql = join(' ' . $self->joiner . ' ', @strings);
+    $sql = "NOT( $sql )" if $sql && $self->negate;
+    return $sql;
 }
 
 # Search.pm converts URL parameters to Clause objects. This helps do the
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 92aaf7fb0..215cc842e 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -381,8 +381,10 @@ sub _handle_field_names {
     my ($or_operand, $negate, $unknownFields, $ambiguous_fields) = @_;
 
     # Flag and requestee shortcut
-    if ($or_operand =~ /^(?:flag:)?([^\?]+\?[^\?]*)$/) {
+    if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) {
         addChart('flagtypes.name', 'substring', $1, $negate);
+        $chart++; $and = $or = 0; # Next chart for boolean AND
+        addChart('requestees.login_name', 'substring', $2, $negate);
         return 1;
     }