From 3d65c6ddab33ac2115ed15922a09781d83b1e603 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 11 Jan 2013 11:05:02 -0100
Subject: [PATCH] Fix U4-1438 Uploading media via the insert media dialog in
 RTE doesn't work and U4-1436 When scaling images in RTE, they're not resized

---
 src/umbraco.cms/businesslogic/media/Media.cs  | 6 +++---
 src/umbraco.cms/businesslogic/web/Document.cs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/media/Media.cs b/src/umbraco.cms/businesslogic/media/Media.cs
index e8e34a7f66..50098b1078 100644
--- a/src/umbraco.cms/businesslogic/media/Media.cs
+++ b/src/umbraco.cms/businesslogic/media/Media.cs
@@ -292,9 +292,6 @@ namespace umbraco.cms.businesslogic.media
         [Obsolete("Obsolete, Use Umbraco.Core.Services.MediaService.Save()", false)]
         public override void Save()
         {
-            SaveEventArgs e = new SaveEventArgs();
-            FireBeforeSave(e);
-
             foreach (var property in GenericProperties)
             {
                 if (property.Value == null)
@@ -303,6 +300,9 @@ namespace umbraco.cms.businesslogic.media
                 MediaItem.SetValue(property.PropertyType.Alias, property.Value);
             }
             
+            SaveEventArgs e = new SaveEventArgs();
+            FireBeforeSave(e);
+            
             if (!e.Cancel)
             {
                 ApplicationContext.Current.Services.MediaService.Save(MediaItem);
diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs
index f933247b2d..52f40d639c 100644
--- a/src/umbraco.cms/businesslogic/web/Document.cs
+++ b/src/umbraco.cms/businesslogic/web/Document.cs
@@ -936,9 +936,6 @@ namespace umbraco.cms.businesslogic.web
         [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Save()", false)]
         public override void Save()
         {
-            var e = new SaveEventArgs();
-            FireBeforeSave(e);
-
             foreach (var property in GenericProperties)
             {
                 if (property.Value == null)
@@ -947,6 +944,9 @@ namespace umbraco.cms.businesslogic.web
                 Content.SetValue(property.PropertyType.Alias, property.Value);
             }
             
+            var e = new SaveEventArgs();
+            FireBeforeSave(e);
+
             if (!e.Cancel)
             {
                 ApplicationContext.Current.Services.ContentService.Save(Content);