Merge from 3.0 branch till 1054.

1 files changed, 11 insertions, 3 deletions

diff --git a/demos/quickstart/protected/pages/Search.php b/demos/quickstart/protected/pages/Search.php
index c7bdce89..297d2f50 100644
--- a/demos/quickstart/protected/pages/Search.php
+++ b/demos/quickstart/protected/pages/Search.php
@@ -9,9 +9,17 @@ class Search extends TPage
 	{

 		if(!$this->IsPostBack && strlen($text = $this->search->getText()) > 0)

 		{

-			$search = $this->getApplication()->getModule("search");

-			$this->results->setDataSource($search->find($text));

-			$this->results->dataBind();

+			$quickstart = $this->getApplication()->getModule("quickstart_search");

+			$hits_1 =  $quickstart->find($text);

+			$this->quickstart_results->setDataSource($hits_1);

+			$this->quickstart_results->dataBind();

+

+			$api = $this->getApplication()->getModule("api_search");

+			$hits_2 = $api->find($text);

+			$this->api_results->setDataSource($hits_2);

+			$this->api_results->dataBind();

+			

+			$this->emptyResult->setVisible(count($hits_1)+count($hits_2) == 0);

 		}

 	}