Fixing search bugsrt-2.1.64

4 files changed, 21 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index eebf33feff..f8f4b8aad4 100755
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 RT_VERSION_MAJOR	=	2
 RT_VERSION_MINOR	=	1
-RT_VERSION_PATCH	=	63
+RT_VERSION_PATCH	=	64
 
 RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
 TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
diff --git a/configure b/configure
index 9adf178e4b..016bc37d5e 100644
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.54 for RT 2.1.63.
+# Generated by GNU Autoconf 2.54 for RT 2.1.64.
 #
 # Report bugs to <rt-3.0-bugs@fsck.com>.
 #
@@ -266,8 +266,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='2.1.63'
-PACKAGE_STRING='RT 2.1.63'
+PACKAGE_VERSION='2.1.64'
+PACKAGE_STRING='RT 2.1.64'
 PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
 
 ac_unique_file="lib/RT.pm.in"
@@ -725,7 +725,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RT 2.1.63 to adapt to many kinds of systems.
+\`configure' configures RT 2.1.64 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -782,7 +782,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 2.1.63:";;
+     short | recursive ) echo "Configuration of RT 2.1.64:";;
    esac
   cat <<\_ACEOF
 
@@ -882,7 +882,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 2.1.63
+RT configure 2.1.64
 generated by GNU Autoconf 2.54
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -897,7 +897,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RT $as_me 2.1.63, which was
+It was created by RT $as_me 2.1.64, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   $ $0 $@
@@ -1209,7 +1209,7 @@ rt_version_major=2
 
 rt_version_minor=1
 
-rt_version_patch=63
+rt_version_patch=64
 
 test "x$rt_version_major" = 'x' && rt_version_major=0
 test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -2231,7 +2231,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 2.1.63, which was
+This file was extended by RT $as_me 2.1.64, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2285,7 +2285,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 2.1.63
+RT config.status 2.1.64
 configured by $0, generated by GNU Autoconf 2.54,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 56c1708fe5..1bf3cb6902 100755
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_REVISION($Revision: 1.1 $)dnl
 
 dnl Setup autoconf
 AC_PREREQ(2.53)
-AC_INIT(RT, [2.1.63], [rt-3.0-bugs@fsck.com])
+AC_INIT(RT, [2.1.64], [rt-3.0-bugs@fsck.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components
diff --git a/html/Search/Listing.html b/html/Search/Listing.html
index c89981edea..b34a61f383 100755
--- a/html/Search/Listing.html
+++ b/html/Search/Listing.html
@@ -27,7 +27,7 @@
     current_tab => 'Search/Listing.html', 
     Title => $title &>
 
-%if ($ticketcount > $session{'tickets_rows_per_page'} && !  $ARGS{'HideResults'}) {
+%if ($ticketcount && !  $ARGS{'HideResults'}) {
 <TABLE WIDTH=100% border=0 cellpadding=3 CELLSPACING=0>
 <& Elements/TicketHeader, %ARGS &>
 % my $i;
@@ -97,14 +97,16 @@ if ($session{'tickets'}) {
     }
     if ( ($ARGS{'ClearRestrictions'}) || ($ARGS{'NewSearch'}) ) {
 	    $session{'tickets'}->ClearRestrictions;
-        $title = loc("Find tickets");
-    } else {
-        $session{'tickets'}->RedoSearch();
+	}	
+}
+   ProcessSearchQuery(ARGS=>\%ARGS);
+   $session{'tickets'}->RedoSearch();
+   if ( $session{'tickets'}->DescribeRestrictions()) {
        $ticketcount = $session{tickets}->Count();
         $title = loc('Found [quant,_1,ticket]', $ticketcount);
-    }
-}
-&ProcessSearchQuery(ARGS=>\%ARGS);
+    } else {
+        $title = loc("Find tickets");
+   }
 
 
 </%INIT>