From 274c4ca4109af46b4e881d7bd6e26aa2bd002f81 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 14 Aug 2015 15:00:48 -0600
Subject: [PATCH] Fix for page not redirecting when changing folder name - #67
 (requires grav update)

---
 classes/admin.php      | 1 -
 classes/controller.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/classes/admin.php b/classes/admin.php
index 9e6728e9..c35e0059 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -158,7 +158,6 @@ class Admin
 
                     $this->setMessage($l->translate('LOGIN_LOGGED_IN'), 'info');
 
-//                    $redirect_route =$this->getLoginRedirect() ?: $this->uri->route();
                     $redirect_route = $this->uri->route();
                     $grav->redirect($redirect_route);
                 }
diff --git a/classes/controller.php b/classes/controller.php
index 96501376..5e9132ce 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -882,8 +882,8 @@ class AdminController
 
         // Always redirect if a page route was changed, to refresh it
         if ($obj instanceof Page\Page) {
-            if (method_exists($obj, 'unsetRoute')) {
-                $obj->unsetRoute();
+            if (method_exists($obj, 'unsetRouteSlug')) {
+                $obj->unsetRouteSlug();
             }
             $this->setRedirect($this->view . $obj->route());
         }