From: teanan <teanan>
Date: Tue, 29 Nov 2005 09:53:27 +0000 (+0900)
Subject: BugTrack2/131: Fixed some warning in error_reporting(E_ALL).
X-Git-Tag: r1_5_0_rc1~171
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki.git;a=commitdiff_plain;h=b898ceb0923bafb797340bdf47e912bb4f81ac45

BugTrack2/131: Fixed some warning in error_reporting(E_ALL).
---

diff --git a/plugin/search.inc.php b/plugin/search.inc.php
index 9e3a954..6f3b30e 100644
--- a/plugin/search.inc.php
+++ b/plugin/search.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: search.inc.php,v 1.9 2005/11/29 08:14:44 teanan Exp $
+// $Id: search.inc.php,v 1.10 2005/11/29 09:53:27 teanan Exp $
 //
 // Search plugin
 
@@ -39,11 +39,12 @@ function plugin_search_action()
 	}
 
 	$type = isset($vars['type']) ? $vars['type'] : '';
+	$base = isset($vars['base']) ? $vars['base']: '';
 
 	if ($s_word != '') {
 		// Search
 		$msg  = str_replace('$1', $s_word, $_title_result);
-		$body = do_search($vars['word'], $type, FALSE, $vars['base']);
+		$body = do_search($vars['word'], $type, FALSE, $base);
 	} else {
 		// Init
 		unset($vars['word']); // Stop using $_msg_word at lib/html.php
@@ -52,7 +53,7 @@ function plugin_search_action()
 	}
 
 	// Show search form
-	$body .= plugin_search_search_form($s_word, $type, array($vars['base']));
+	$body .= plugin_search_search_form($s_word, $type, array($base));
 
 	return array('msg'=>$msg, 'body'=>$body);
 }
@@ -97,7 +98,6 @@ EOD;
 	return <<<EOD
 <form action="$script?cmd=search" method="post">
  <div>
-  <input type="hidden" name="base" value="$s_base" />
   <input type="text"  name="word" value="$s_word" size="20" />
   <input type="radio" name="type" id="_p_search_AND" value="AND" $and_check />
   <label for="_p_search_AND">$_btn_and</label>