Merge branch 'master' of github.com:cargomedia/CM into issue-1640

cargomedia · Feb 16, 2015 · 3b17f65 · 3b17f65
2 parents de45e05 + 96bd652
commit 3b17f65
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/layout/default/css/function.fancySelect.less b/layout/default/css/function.fancySelect.less
@@ -34,8 +34,7 @@
     right: 0;
     bottom: 0;
     height: 100%;
-    min-width: 100%;
-    width: auto;
+    width: 100%;
     opacity: 0;
     .appearance(none);
     cursor: pointer;

diff --git a/library/CM/Http/Response/Page.php b/library/CM/Http/Response/Page.php
@@ -12,7 +12,7 @@ class CM_Http_Response_Page extends CM_Http_Response_Abstract {
     private $_redirectUrl;
 
     public function __construct(CM_Http_Request_Abstract $request, CM_Service_Manager $serviceManager) {
-        $this->_request = $request;
+        $this->_request = clone $request;
         $this->_site = CM_Site_Abstract::findByRequest($this->_request);
         $this->_request->popPathLanguage();
 

diff --git a/library/CM/Http/Response/View/Abstract.php b/library/CM/Http/Response/View/Abstract.php
@@ -68,6 +68,8 @@ public function loadPage(CM_Params $params, CM_Http_Response_View_Ajax $response
             }
             $responsePage = new CM_Http_Response_Page_Embed($request, $this->getServiceManager());
             $responsePage->process();
+            $request = $responsePage->getRequest();
+
             $paths[] = $request->getPath();
 
             if ($redirectUrl = $responsePage->getRedirectUrl()) {

diff --git a/tests/library/CM/Http/Request/AbstractTest.php b/tests/library/CM/Http/Request/AbstractTest.php
@@ -80,8 +80,8 @@ public function testGetLanguageByUrl() {
         CMTest_TH::createLanguage('en'); // default language
         $urlLanguage = CMTest_TH::createLanguage('de');
         $request = $this->_prepareRequest('/de/home');
-        CM_Http_Response_Abstract::factory($request, $this->getServiceManager());
-        $this->assertEquals($request->getLanguage(), $urlLanguage);
+        $response = CM_Http_Response_Abstract::factory($request, $this->getServiceManager());
+        $this->assertEquals($response->getRequest()->getLanguage(), $urlLanguage);
     }
 
     public function testGetLanguageByBrowser() {