From 5e2a86bba7a92d125156f60f48ffe1d4c178263d Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 11 Jan 2013 08:09:55 -0100
Subject: [PATCH 1/2] Fixes U4-1432 4.11.2 - Tinymce strips 'src' attribute
 from images

---
 src/Umbraco.Web.UI/config/umbracoSettings.Release.config | 2 +-
 src/Umbraco.Web.UI/config/umbracoSettings.config         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index d213e0909e..d70b455d11 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -5,7 +5,7 @@
       <!-- what file extension that should cause umbraco to create thumbnails -->
       <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
       <!-- what attributes that are allowed in the editor on an img tag -->
-      <allowedAttributes>alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
+      <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
       <!-- automatically updates dimension, filesize and extension attributes on upload -->
       <autoFillImageProperties>
         <uploadField alias="umbracoFile">
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 79d8dd0ea9..372777126a 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -5,7 +5,7 @@
             <!-- what file extension that should cause umbraco to create thumbnails -->
             <imageFileTypes>jpeg,jpg,gif,bmp,png,tiff,tif</imageFileTypes>
             <!-- what attributes that are allowed in the editor on an img tag -->
-            <allowedAttributes>alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
+            <allowedAttributes>src,alt,border,class,style,align,id,name,onclick,usemap</allowedAttributes>
             <!-- automatically updates dimension, filesize and extension attributes on upload -->
             <autoFillImageProperties>
                 <uploadField alias="umbracoFile">

From ba1a2c1520b3380fe41cfb6870301d42d6bea966 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 11 Jan 2013 08:18:00 -0100
Subject: [PATCH 2/2] Add Beta to the version

---
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 9e721820c2..39a111e328 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return ""; } }
+        public static string CurrentComment { get { return "Beta"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx