From e6ccd8a5b586d895b945d6981d2eefd8a356b610 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 9 Apr 2013 11:33:35 -0200
Subject: [PATCH] Fix for U4-2081 tinymce Image picker does not work in 6.03

---
 .../datatype/DataTypeDefinition.cs             | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
index 4040f81409..f88c17ade3 100644
--- a/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
@@ -51,18 +51,16 @@ namespace umbraco.cms.businesslogic.datatype
         {
             get
             {
-                if (_controlId != Guid.Empty)
-                {
-                    cms.businesslogic.datatype.controls.Factory f = new cms.businesslogic.datatype.controls.Factory();
-                    interfaces.IDataType dt = f.DataType(_controlId);
+                if (_controlId == Guid.Empty) 
+                    return null;
+                
+                controls.Factory factory = new controls.Factory();
+                var dt = factory.DataType(_controlId);
+
+                if (dt != null)
                     dt.DataTypeDefinitionId = Id;
 
-                    return dt;
-                }
-                else
-                {
-                    return null;
-                }
+                return dt;
             }
             set
             {