From 7fcf2391326e9c57ef00b68691b0280eeb8e5545 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 19 Aug 2015 16:54:30 -0600 Subject: [PATCH] removed some double slash situations --- classes/controller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/controller.php b/classes/controller.php index 62087373..19eb2d2c 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -917,7 +917,7 @@ class AdminController $path = $route . '/' . $folder; $this->admin->session()->{$path} = $data; - $this->setRedirect("{$this->view}/{$path}"); + $this->setRedirect("{$this->view}/". ltrim($path, '/')); return true; } @@ -971,7 +971,8 @@ class AdminController // Enqueue message and redirect to new location. $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_COPIED'), 'info'); - $this->setRedirect($this->view . '/' . $parent->route() . '/'. $page->slug()); + $parent_route = $parent->route() ? '/' . ltrim($parent->route(), '/') : ''; + $this->setRedirect($this->view . $parent_route . '/'. $page->slug()); } catch (\Exception $e) { throw new \RuntimeException('Copying page failed on error: ' . $e->getMessage());