From 369993d439b72267508aa905819f07ec488e7fe9 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 5 Jul 2012 20:11:06 +0000
Subject: [PATCH] Make customfield page not fail in et2

---
 admin/inc/class.customfields.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin/inc/class.customfields.inc.php b/admin/inc/class.customfields.inc.php
index d57fbff932..1312ead43a 100644
--- a/admin/inc/class.customfields.inc.php
+++ b/admin/inc/class.customfields.inc.php
@@ -87,11 +87,16 @@ class customfields
 				//error_log( array2string($this->content_types));
 			}
 		}
-		else
+		elseif (!($this->tmpl instanceof etemplate_widget))
 		{
 			$this->tmpl->children[0]['data'][2]['A']['disabled'] = true;
 			$this->tmpl->children[0]['data'][3]['A']['disabled'] = true;
 		}
+		elseif(method_exists($this->tmpl, 'disableElement'))
+		{
+			// et2
+			$this->tmpl->disableElement('admin.customfields.type', true);
+		}
 		if (is_array($content))
 		{
 			//echo '<pre style="text-align: left;">'; print_r($content); echo "</pre>\n";