Fix for taskCopy and taskMove

This commit is contained in:
Andy Miller
2017-03-28 21:34:32 -07:00
parent cd97808042
commit 32d24c0d6d

View File

@@ -1781,7 +1781,9 @@ class AdminController extends AdminBaseController
// $page->folder($ordering . $slug); // $page->folder($ordering . $slug);
// } // }
if ($input['folder'] != $page->value('folder')) {
if (isset($input['folder']) && ($input['folder'] != $page->value('folder'))) {
$order = $page->value('order'); $order = $page->value('order');
$ordering = $order ? sprintf('%02d.', $order) : ''; $ordering = $order ? sprintf('%02d.', $order) : '';
$page->folder($ordering . $input['folder']); $page->folder($ordering . $input['folder']);
@@ -1879,6 +1881,8 @@ class AdminController extends AdminBaseController
$order = $this->getNextOrderInFolder($page->parent()->path()); $order = $this->getNextOrderInFolder($page->parent()->path());
} }
$this->preparePage($page);
// Make sure the header is loaded in case content was set through raw() (expert mode) // Make sure the header is loaded in case content was set through raw() (expert mode)
$page->header(); $page->header();