From e2149e3d8b87b382563a9def6f376a5f289754d3 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 12 May 2006 12:38:32 +0000
Subject: Merge from 3.0 branch till 1054.

---
 demos/quickstart/protected/index/ZendSearch.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'demos/quickstart/protected/index/ZendSearch.php')

diff --git a/demos/quickstart/protected/index/ZendSearch.php b/demos/quickstart/protected/index/ZendSearch.php
index 136004de..ec15729c 100644
--- a/demos/quickstart/protected/index/ZendSearch.php
+++ b/demos/quickstart/protected/index/ZendSearch.php
@@ -26,10 +26,13 @@ class ZendSearch extends TModule
 	
 	protected function importZendNamespace()
 	{
-		$zendBase = !is_null($this->_ZF) ? $this->_ZF.'.*' : 'Application.index.*';
-		$path = !is_null($this->_ZF) ? $this->_ZF.'.Zend.*' : 'Application.index.Zend.*';
-		Prado::using($zendBase);
-		Prado::setPathOfAlias('Zend', Prado::getPathOfNamespace($path));
+		if(is_null(Prado::getPathOfAlias('Zend')))
+		{
+			$zendBase = !is_null($this->_ZF) ? $this->_ZF.'.*' : 'Application.index.*';
+			$path = !is_null($this->_ZF) ? $this->_ZF.'.Zend.*' : 'Application.index.Zend.*';
+			Prado::using($zendBase);
+			Prado::setPathOfAlias('Zend', Prado::getPathOfNamespace($path));
+		}
 	}
 	
 	protected function getZendSearch()
-- 
cgit v1.2.3