Ticket #4435: ctf-translatable-fix.patch

cms/code/CMSMain.php

@@ -431 +431 @@
                                 $readonlyFields = $form->Fields()->makeReadonly();
                                 $form->setFields($readonlyFields);
                         }
+                        
+                        // Set locale in the form action, so that CTFs in the child form, etc, work
+                        if(Translatable::is_enabled()) {
+                                $locale = Translatable::get_current_locale();
+                                if($locale != Translatable::default_locale()) {
+                                        $form->setFormAction(Controller::join_links($form->FormAction(), "?locale=" 
+                                                . htmlentities($locale)));
+                                }
+                        }
 
                         return $form;
                 } else if($id) {

sapphire/forms/ComplexTableField.php

@@ -364 +364 @@
 
 
         function AddLink() {
-                return $this->Link() . '/add';
+                return Controller::join_links($this->Link(), '/add');
         }
 
         /**
@@ -650 +650 @@
                 $message = sprintf(
                         _t('ComplexTableField.SUCCESSADD', 'Added %s %s %s'),
                         $childData->singular_name(),
-                        '<a href="' . $this->Link() . '/item/' . $childData->ID . '/edit">' . $childData->Title . '</a>',
+                        '<a href="' . Controller::join_links($this->Link(), '/item/' . $childData->ID . '/edit')
+                                . '">' . $childData->Title . '</a>',
                         $closeLink
                 );
                 
@@ -674 +675 @@
         );
         
         function Link() {
-                return $this->ctf->Link() . '/item/' . $this->itemID;
+                return Controller::join_links($this->ctf->Link(), '/item/' . $this->itemID);
         }
         
         function __construct($ctf, $itemID) {
@@ -883 +884 @@
         }
                 for($i = $offset;$i <= $offset + $this->pageSize && $i <= $this->totalCount;$i++) {
             $start = $i - 1;
-                        $links['link'] = Controller::join_links($this->Link() . "$this->methodName?ctf[start]={$start}");
+                        $links['link'] = Controller::join_links($this->Link(), "$this->methodName?ctf[start]={$start}");
             $links['number'] = $i;
             $links['active'] = $i == $currentItem ? false : true;
             $result->push(new ArrayData($links));       
@@ -983 +984 @@
         }
 
         function Link() {
-                return $this->parent->Link() . '/item/' . $this->item->ID;
+                return Controller::join_links($this->parent->Link(), '/item/' . $this->item->ID);
         }
 
         function EditLink() {
-                return $this->Link() . "/edit";
+                return Controller::join_links($this->Link(), "/edit");
         }
 
         function ShowLink() {
-                return $this->Link() . "/show";
+                return Controller::join_links($this->Link(), "/show");
         }
 
         function DeleteLink() {
-                return $this->Link() . "/delete";
+                return Controller::join_links($this->Link(), "/delete");
         }
         
         /**