Item2342: I think the return of ->param() has changed in trunk, and …

…we need an undef to allow the inline hash to work when converted to a list of params.. git-svn-id: http://svn.foswiki.org/trunk@5470 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 9, 2009 · ac12be6 · ac12be6
1 parent eff3cc5
commit ac12be6
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/core/lib/Foswiki/UI/Search.pm b/core/lib/Foswiki/UI/Search.pm
@@ -84,32 +84,32 @@ sub search {
         _callback      => undef,
         _cbdata        => undef,
         'inline'       => 0,
-        'search'       => $query->param('search'),
+        'search'       => $query->param('search') || undef,
         'web'          => $attrWeb,
-        'topic'        => $query->param('topic'),
-        'excludetopic' => $query->param('excludetopic'),
-        'scope'        => $query->param('scope'),
-        'order'        => $query->param('order'),
+        'topic'        => $query->param('topic') || undef,
+        'excludetopic' => $query->param('excludetopic') || undef,
+        'scope'        => $query->param('scope') || undef,
+        'order'        => $query->param('order') || undef,
         'type'         => $query->param('type')
-          || $session->{prefs}->getPreference('SEARCHDEFAULTTTYPE'),
-        'regex'           => $query->param('regex'),
-        'limit'           => $query->param('limit'),
-        'reverse'         => $query->param('reverse'),
-        'casesensitive'   => $query->param('casesensitive'),
-        'nosummary'       => $query->param('nosummary'),
-        'nosearch'        => $query->param('nosearch'),
-        'noheader'        => $query->param('noheader'),
-        'nototal'         => $query->param('nototal'),
-        'bookview'        => $query->param('bookview'),
-        'showlock'        => $query->param('showlock'),
-        'expandvariables' => $query->param('expandvariables'),
-        'noempty'         => $query->param('noempty'),
-        'template'        => $query->param('template'),
-        'header'          => $query->param('header'),
-        'format'          => $query->param('format'),
-        'multiple'        => $query->param('multiple'),
-        'separator'       => $query->param('separator'),
-        'subweb'          => $query->param('subweb')
+          || $session->{prefs}->getPreference('SEARCHDEFAULTTTYPE') || undef,
+        'regex'           => $query->param('regex') || undef,
+        'limit'           => $query->param('limit') || undef,
+        'reverse'         => $query->param('reverse') || undef,
+        'casesensitive'   => $query->param('casesensitive') || undef,
+        'nosummary'       => $query->param('nosummary') || undef,
+        'nosearch'        => $query->param('nosearch') || undef,
+        'noheader'        => $query->param('noheader') || undef,
+        'nototal'         => $query->param('nototal') || undef,
+        'bookview'        => $query->param('bookview') || undef,
+        'showlock'        => $query->param('showlock') || undef,
+        'expandvariables' => $query->param('expandvariables') || undef,
+        'noempty'         => $query->param('noempty') || undef,
+        'template'        => $query->param('template') || undef,
+        'header'          => $query->param('header') || undef,
+        'format'          => $query->param('format') || undef,
+        'multiple'        => $query->param('multiple') || undef,
+        'separator'       => $query->param('separator') || undef,
+        'subweb'          => $query->param('subweb') || undef
     );
 
     $session->writeCompletePage($text);