[rt-commit] [svn] r622 - in rt/branches/rt-3.1: . bin

[jesse at fsck.com]

Author: jesse
Date: Thu Mar 25 10:33:23 2004
New Revision: 622

Modified:
   rt/branches/rt-3.1/   (props changed)
   rt/branches/rt-3.1/bin/rt.in   (contents, props changed)
   rt/branches/rt-3.1/releng.cnf
Log:
Bumping to 3.1.12

Modified: rt/branches/rt-3.1/bin/rt.in
==============================================================================
--- rt/branches/rt-3.1/bin/rt.in	(original)
+++ rt/branches/rt-3.1/bin/rt.in	Thu Mar 25 10:33:23 2004
@@ -148,9 +148,17 @@
             my $title = $item->[2]{Title};
             my @titles = ref $title eq 'ARRAY' ? @$title : $title;
 
+<<<<<<< local
             foreach $title (@titles) {
                 $help{$title} = $item->[2]{Text};
             }
+||||||| base
+        foreach $title (@titles) {
+            $help{$title} = $item->[2]{Text};
+=======
+        foreach $title (grep $_, @titles) {
+            $help{$title} = $item->[2]{Text};
+>>>>>>> new
         }
     }
 
@@ -235,7 +243,7 @@
     }
     return help("list", $type) if $bad;
 
-    my $r = submit("$REST/search/$type", { query => $q, %data });
+    my $r = submit("$REST/search/$type", { query => $q, %data, orderby => $orderby || "" });
     print $r->content;
 }
 

Modified: rt/branches/rt-3.1/releng.cnf
==============================================================================
--- rt/branches/rt-3.1/releng.cnf	(original)
+++ rt/branches/rt-3.1/releng.cnf	Thu Mar 25 10:33:23 2004
@@ -1,5 +1,5 @@
 PRODUCT			        = rt
-TAG			            = 3.1.11
+TAG			            = 3.1.12
 CANONICAL_REPO		    = svn+ssh://svn.bestpractical.com/svn/bps-public/rt/
 TAGS		            = tags/
 TRUNK	                = branches/rt-3.1/