From 16fe926e5d76eed811fe5244766716c5d4437c16 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Thu, 20 Aug 2015 15:17:45 +0200
Subject: [PATCH] Make sure that saving a page just saves it in its own
 language

---
 classes/controller.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/classes/controller.php b/classes/controller.php
index d73b5818..06d57655 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -836,14 +836,13 @@ class AdminController
             $parent = $route && $route != '/' ? $pages->dispatch($route, true) : $pages->root();
 
             $obj = $this->admin->page(true);
+
             $original_slug = $obj->slug();
             $original_order = intval(trim($obj->order(), '.'));
 
-
-
             // Change parent if needed and initialize move (might be needed also on ordering/folder change).
             $obj = $obj->move($parent);
-            $this->preparePage($obj);
+            $this->preparePage($obj, false, $obj->language());
 
             // Reset slug and route. For now we do not support slug twig variable on save.
             $obj->slug($original_slug);
@@ -895,7 +894,7 @@ class AdminController
             if (method_exists($obj, 'unsetRouteSlug')) {
                 $obj->unsetRouteSlug();
             }
-            $this->setRedirect($this->view . $obj->route());
+            $this->setRedirect('/' . $obj->language(). '/admin/' . $this->view . $obj->route());
         }
 
         return true;