diff options
| author | xue <> | 2006-05-12 12:38:32 +0000 |
|---|---|---|
| committer | xue <> | 2006-05-12 12:38:32 +0000 |
| commit | e2149e3d8b87b382563a9def6f376a5f289754d3 (patch) | |
| tree | fd24e9c28d023a483cc632683e6e998d2e11bfce /demos/quickstart/protected/index | |
| parent | d84327e69e858d369ea0c78f6106cfaa54994032 (diff) | |
Merge from 3.0 branch till 1054.
Diffstat (limited to 'demos/quickstart/protected/index')
| -rw-r--r-- | demos/quickstart/protected/index/ZendSearch.php | 11 | ||||
| -rw-r--r-- | demos/quickstart/protected/index/api/_0.cfs | bin | 0 -> 378721 bytes | |||
| -rw-r--r-- | demos/quickstart/protected/index/api/deletable (renamed from demos/quickstart/protected/index/data/deletable) | bin | 4 -> 4 bytes | |||
| -rw-r--r-- | demos/quickstart/protected/index/api/segments | bin | 0 -> 27 bytes | |||
| -rw-r--r-- | demos/quickstart/protected/index/quickstart/_0.cfs (renamed from demos/quickstart/protected/index/data/_0.cfs) | bin | 329302 -> 329302 bytes | |||
| -rw-r--r-- | demos/quickstart/protected/index/quickstart/deletable | bin | 0 -> 4 bytes | |||
| -rw-r--r-- | demos/quickstart/protected/index/quickstart/segments (renamed from demos/quickstart/protected/index/data/segments) | bin | 27 -> 27 bytes |
7 files changed, 7 insertions, 4 deletions
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()
diff --git a/demos/quickstart/protected/index/api/_0.cfs b/demos/quickstart/protected/index/api/_0.cfs Binary files differnew file mode 100644 index 00000000..b5eb219b --- /dev/null +++ b/demos/quickstart/protected/index/api/_0.cfs diff --git a/demos/quickstart/protected/index/data/deletable b/demos/quickstart/protected/index/api/deletable Binary files differindex 593f4708..593f4708 100644 --- a/demos/quickstart/protected/index/data/deletable +++ b/demos/quickstart/protected/index/api/deletable diff --git a/demos/quickstart/protected/index/api/segments b/demos/quickstart/protected/index/api/segments Binary files differnew file mode 100644 index 00000000..da225127 --- /dev/null +++ b/demos/quickstart/protected/index/api/segments diff --git a/demos/quickstart/protected/index/data/_0.cfs b/demos/quickstart/protected/index/quickstart/_0.cfs Binary files differindex f3cb1bfb..f3cb1bfb 100644 --- a/demos/quickstart/protected/index/data/_0.cfs +++ b/demos/quickstart/protected/index/quickstart/_0.cfs diff --git a/demos/quickstart/protected/index/quickstart/deletable b/demos/quickstart/protected/index/quickstart/deletable Binary files differnew file mode 100644 index 00000000..593f4708 --- /dev/null +++ b/demos/quickstart/protected/index/quickstart/deletable diff --git a/demos/quickstart/protected/index/data/segments b/demos/quickstart/protected/index/quickstart/segments Binary files differindex 5509e664..5509e664 100644 --- a/demos/quickstart/protected/index/data/segments +++ b/demos/quickstart/protected/index/quickstart/segments |