Merge with 4.11.7

2013-04-09 11:37:37 -02:00
parent a9781d79e2 e6ccd8a5b5
commit db4ed70d70
1 changed files with 8 additions and 10 deletions
--- 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
            {