From ee2c8003db7f245422d8ed4fbcea4c7d47e81fb0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 29 Dec 2011 09:53:18 +0100
Subject: [PATCH] MINOR Merge error

---
 code/controllers/CMSMain.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 59b3481c..8116a387 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -252,7 +252,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			
 			$defaultParent = $obj->defaultParent();
 			$id = $defaultParent ? SiteTree::get_by_link($defaultParent)->ID : null;
-			$defaultParent = $id ? SiteTree::get_by_link($obj->defaultParent())->ID : null;
 			
 			if ($defaultParent != 1 && $defaultParent != null)  $def[$class]['defaultParent'] = $defaultParent;