Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-specify locale options in View/Helper/LocaleUrl #38

Merged
merged 1 commit into from
Oct 24, 2013
Merged

Auto-specify locale options in View/Helper/LocaleUrl #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/SlmLocale/View/Helper/LocaleUrl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ public function __invoke($locale, $name = null, $params = array(), $options = ar
* route match is present, we've a 404 and grab the path from the request object.
*/
if ($this->getRouteMatch()) {

if (!isset($options['locale'])) {
$options['locale'] = $locale;
}

$url = $this->getView()->url($name, $params, $options, $reuseMatchedParams);
} else {
$url = $this->getRequest()->getUri()->getPath();
Expand Down