fix current url bug + fix empty loop pagination exception

This commit is contained in:
Etienne Roudeix
2013-09-12 17:20:33 +02:00
parent 3f82421879
commit a73c9e1de4
5 changed files with 23 additions and 22 deletions

View File

@@ -232,10 +232,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);