FIX: prevent notice while doing search request.

silverstripe · Sep 9, 2012 · 4ffa1c7 · 4ffa1c7
1 parent b4dc440
commit 4ffa1c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/code/DocumentationSearch.php b/code/DocumentationSearch.php
@@ -182,8 +182,9 @@ public function set_index($index) {
 	 * @return string
 	 */
 	public function get_index_location() {
-		if(!self::$index_location) 
+		if(!self::$index_location) {
 			self::$index_location = DOCSVIEWER_DIR;
+		}
 
 		return Controller::join_links(
 			TEMP_FOLDER, 

diff --git a/code/controllers/DocumentationViewer.php b/code/controllers/DocumentationViewer.php
@@ -14,7 +14,7 @@
 
 class DocumentationViewer extends Controller {
 
-	static $allowed_actions = array(
+	public static $allowed_actions = array(
 		'home',
 		'LanguageForm',
 		'doLanguageForm',
@@ -135,8 +135,9 @@ public function handleAction($request) {
 	 */
 	public function handleRequest(SS_HTTPRequest $request, DataModel $model) {
 		// if we submitted a form, let that pass
-		if(!$request->isGET() || isset($_GET['action_results'])) 
-			return parent::handleRequest($request);
+		if(!$request->isGET() || isset($_GET['action_results'])) {
+			return parent::handleRequest($request, $model);
+		}
 
 		$firstParam = ($request->param('Action')) ? $request->param('Action') : $request->shift();		
 		$secondParam = $request->shift();

diff --git a/code/tasks/RebuildLuceneDocsIndex.php b/code/tasks/RebuildLuceneDocsIndex.php
@@ -32,6 +32,8 @@ function rebuildIndexes($quiet = false) {
 		$lock = DocumentationSearch::get_index_location() .'/write.lock.file';
 		$lockFileFresh = (file_exists($lock) && filemtime($lock) > (time() - (60 * 60 * 24)));
 
+		echo "Building index in ". DocumentationSearch::get_index_location() . PHP_EOL;
+
 		if($lockFileFresh && !isset($_REQUEST['flush'])) { 
 			if(!$quiet) {
 				echo "Index recently rebuilt. If you want to force reindex use ?flush=1";