summaryrefslogtreecommitdiff
path: root/demos/quickstart/protected/index
diff options
context:
space:
mode:
Diffstat (limited to 'demos/quickstart/protected/index')
-rw-r--r--demos/quickstart/protected/index/ZendSearch.php11
-rw-r--r--demos/quickstart/protected/index/api/_0.cfsbin0 -> 378721 bytes
-rw-r--r--demos/quickstart/protected/index/api/deletable (renamed from demos/quickstart/protected/index/data/deletable)bin4 -> 4 bytes
-rw-r--r--demos/quickstart/protected/index/api/segmentsbin0 -> 27 bytes
-rw-r--r--demos/quickstart/protected/index/quickstart/_0.cfs (renamed from demos/quickstart/protected/index/data/_0.cfs)bin329302 -> 329302 bytes
-rw-r--r--demos/quickstart/protected/index/quickstart/deletablebin0 -> 4 bytes
-rw-r--r--demos/quickstart/protected/index/quickstart/segments (renamed from demos/quickstart/protected/index/data/segments)bin27 -> 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
new file mode 100644
index 00000000..b5eb219b
--- /dev/null
+++ b/demos/quickstart/protected/index/api/_0.cfs
Binary files differ
diff --git a/demos/quickstart/protected/index/data/deletable b/demos/quickstart/protected/index/api/deletable
index 593f4708..593f4708 100644
--- a/demos/quickstart/protected/index/data/deletable
+++ b/demos/quickstart/protected/index/api/deletable
Binary files differ
diff --git a/demos/quickstart/protected/index/api/segments b/demos/quickstart/protected/index/api/segments
new file mode 100644
index 00000000..da225127
--- /dev/null
+++ b/demos/quickstart/protected/index/api/segments
Binary files differ
diff --git a/demos/quickstart/protected/index/data/_0.cfs b/demos/quickstart/protected/index/quickstart/_0.cfs
index f3cb1bfb..f3cb1bfb 100644
--- a/demos/quickstart/protected/index/data/_0.cfs
+++ b/demos/quickstart/protected/index/quickstart/_0.cfs
Binary files differ
diff --git a/demos/quickstart/protected/index/quickstart/deletable b/demos/quickstart/protected/index/quickstart/deletable
new file mode 100644
index 00000000..593f4708
--- /dev/null
+++ b/demos/quickstart/protected/index/quickstart/deletable
Binary files differ
diff --git a/demos/quickstart/protected/index/data/segments b/demos/quickstart/protected/index/quickstart/segments
index 5509e664..5509e664 100644
--- a/demos/quickstart/protected/index/data/segments
+++ b/demos/quickstart/protected/index/quickstart/segments
Binary files differ