topic fix

scc · Dec 1, 2004 · 74b20f0 · 74b20f0
1 parent aa73885
commit 74b20f0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/plugins/Search/search.pl b/plugins/Search/search.pl
@@ -40,7 +40,12 @@ sub main {
 	my $searchDB  = getObject('Slash::Search', { db_type => 'search' });
 
 	# Backwards compatibility, we now favor tid over topic 
-	$form->{tid} ||= $form->{topic};
+	if ($form->{topic}) {
+		if ($form->{topic} =~ s/^([+-]?[\d.]+).*$/$1/s) {
+			$form->{tid} ||= $form->{topic};
+		}
+		delete $form->{topic};
+	}
 
 	# Set some defaults
 	$form->{query}		||= '';
@@ -144,7 +149,7 @@ sub _buildargs {
 	my($form) = @_;
 	my $uri;
 
-	for (qw[threshold query author op topic tid section sort journal_only]) {
+	for (qw[threshold query author op tid section sort journal_only]) {
 		my $x = "";
 		$x =  $form->{$_} if defined $form->{$_} && $x eq "";
 		$x =~ s/ /+/g;