Thread: [phpwiki-checkins] CVS: phpwiki/lib main.php,1.15,1.16

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16259/lib
Modified Files:
	main.php 
Log Message:
Fix SF bug #480061: Example search forms on MagicPhpWikiURLs
were broken.
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** main.php	2001年11月08日 16:02:40	1.15
--- main.php	2001年11月09日 17:58:09	1.16
***************
*** 113,123 ****
 
 case 'search':
! $request->compress_output();
 if ($request->getArg('searchtype') == 'full') {
! include "lib/fullsearch.php";
 }
 else {
! include "lib/search.php";
 }
 break;
 
--- 113,127 ----
 
 case 'search':
! // This is obsolete: reformulate URL and redirect.
! // FIXME: this whole section should probably be deleted.
 if ($request->getArg('searchtype') == 'full') {
! $search_page = gettext('FullTextSearch');
 }
 else {
! $search_page = gettext('TitleSearch');
 }
+ $request->redirect(WikiURL($search_page,
+ array('s' => $request->getArg('searchterm')),
+ 'absolute_url'));
 break;