From eaf05a6a7c9c7c214120922e12861e9dff25ca6c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 14 Jun 2012 09:42:55 +0200 Subject: [PATCH] BUGFIX AssetAdmin root navigation (fixes #7448) Return a new object instance rather than relying on singleton(), which might've been modified elsewhere, and have a non-zero ID/ParentID. --- code/controllers/AssetAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index 9bc10357..f19e849d 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -462,7 +462,7 @@ JS if($id && is_numeric($id) && $id > 0) { return DataObject::get_by_id('Folder', $id); } else { - return singleton('Folder'); + return new Folder(); } }