TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source
This commit is contained in:
franck
2013-09-13 00:16:56 +02:00
parent 6a66a3f99a a241c4d587
commit 7cd44c3867
8 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Tools/URL.php
View File

@@ -236,10 +236,10 @@ class URL
$this->retriever->loadSpecificUrl($view, $viewLocale, $viewId, $allOtherParameters);
} else {
$allParametersWithoutView = $viewOtherParameters;
$allParametersWithoutView['locale'] = $viewLocale;
if (null !== $viewId) {
$allParametersWithoutView[$view . '_id'] = $viewId;
$allParametersWithoutView = $request->query->all();
$view = $request->attributes->get('_view');
if(isset($allOtherParameters['view'])) {
unset($allOtherParameters['view']);
}
$this->retriever->rewrittenUrl = null;
$this->retriever->url = URL::getInstance()->viewUrl($view, $allParametersWithoutView);