Permalink
Browse files

Merge pull request #146 from hafriedlander/fix/142_malformed_links

FIX 6336632 breaking "Existing Translations" links
  • Loading branch information...
2 parents a0fab3b + 3acb8b9 commit 44584a27217b3c3b6a07d4103fe1619e695930c3 @mateusz mateusz committed Sep 20, 2013
Showing with 3 additions and 4 deletions.
  1. +3 −4 code/model/Translatable.php
View
7 code/model/Translatable.php
@@ -1075,10 +1075,9 @@ function updateCMSFields(FieldList $fields) {
if($existingTranslation && $existingTranslation->hasMethod('CMSEditLink')) {
$existingTransHTML .= sprintf(
'<li><a href="%s">%s</a></li>',
- sprintf(
- '%s/?locale=%s',
- $existingTranslation->CMSEditLink(),
- $existingTranslation->Locale
+ Controller::join_links(
+ $existingTranslation->CMSEditLink(),
+ '?locale='.$existingTranslation->Locale
),
i18n::get_locale_name($existingTranslation->Locale)
);

0 comments on commit 44584a2

Please sign in to comment.