yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' into 7.3.0

Browse Source 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/umbraco.macroRenderings/app.config
This commit is contained in:
Shannon
2015-05-05 12:27:01 +10:00
parent 66263a44a5 ab0e549c70
commit 2f9753cc12
33 changed files with 1612 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/UI/JavaScript/ServerVariablesParser.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.Web.UI.JavaScript
{
/// <summary>
/// Could allow developers to add custom variables on startup
/// Allows developers to add custom variables on parsing
/// </summary>
public static event EventHandler<Dictionary<string, object>> Parsing;
@@ -18,6 +18,7 @@ namespace Umbraco.Web.UI.JavaScript
{
var vars = Resources.ServerVariables;
//Raise event for developers to add custom variables
if (Parsing != null)
{
Parsing(null, items);