Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5

This commit is contained in:
Shannon
2014-07-23 09:04:01 -07:00
3 changed files with 5 additions and 1 deletions

View File

@@ -14,6 +14,7 @@ ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %rel
ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice
SET nuGetFolder=%CD%\..\src\packages\
..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/
..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
ECHO Removing the belle build folder to make sure everything is clean as a whistle

Binary file not shown.

View File

@@ -5,7 +5,9 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web.Http;
using System.Xml;
using umbraco.BusinessLogic;
using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
using Umbraco.Web.Editors;
using Umbraco.Web.Mvc;
using Umbraco.Web.WebApi.Filters;
@@ -65,8 +67,9 @@ namespace Umbraco.Web.PropertyEditors
result.Markup = prov.GetMarkup(url, width, height);
result.Status = Status.Success;
}
catch
catch(Exception ex)
{
LogHelper.Error<RteEmbedController>(string.Format("Error embedding url {0} - width: {1} height: {2}", url, width, height), ex);
result.Status = Status.Error;
}