Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -115,6 +115,10 @@ class IndexController extends AbstractAction
             'p_d' => FILTER_DEFAULT,), false);
         $condition['brand'] = $brandId;
         
+        if ($brandId === 0) {
+            $condition['query'] = $domain;
+        }
+
         if (isset($condition['gender'])) {
             $condition['gender'] = rawurldecode($condition['gender']);
         } else {

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.0.5"
+application.version = "1.0.6"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.0.5"
+application.version = "1.0.6"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.0.5"
+application.version = "1.0.6"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.0.5"
+application.version = "1.0.6"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货"

 [memcached]
 master.hosts = 127.0.0.1:11212,127.0.0.1:11213
 slave.hosts = 127.0.0.1:11212,127.0.0.1:11213
-memcached.session = 127.0.0.1:11212,127.0.0.1:11213
+session.hosts = 127.0.0.1:11212,127.0.0.1:11213
 
 [redis]
 servers.hosts = 192.168.1.168:6379
\ No newline at end of file

 [memcached]
 master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
 slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112
-memcached.session=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
+session.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
 
 [redis]
 servers.hosts=127.0.0.1:6379
\ No newline at end of file

 [memcached]
 master.hosts=127.0.0.1:11212,127.0.0.1:11213
 slave.hosts=127.0.0.1:11212,127.0.0.1:11213
-memcached.session=127.0.0.1:11212,127.0.0.1:11213
+session.hosts=127.0.0.1:11212,127.0.0.1:11213
 
 [redis]
 servers.hosts = 127.0.0.1:6379
\ No newline at end of file