From 8576d9c67edf0e52144a1b409f124d86d4225497 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 27 Mar 2013 08:56:30 -0100 Subject: [PATCH 1/5] Bump version to 4.11.6 --- build/Build.bat | 2 +- src/Umbraco.Core/Configuration/GlobalSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Build.bat b/build/Build.bat index 46385e0b28..64aea0d0ef 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,5 +1,5 @@ @ECHO OFF -set version=4.11.5 +set version=4.11.6 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%version% echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index cb032fabf2..15e978aa52 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -28,7 +28,7 @@ namespace Umbraco.Core.Configuration #region Private static fields // CURRENT UMBRACO VERSION ID - private const string CurrentUmbracoVersion = "4.11.5"; + private const string CurrentUmbracoVersion = "4.11.6"; private static readonly object Locker = new object(); //make this volatile so that we can ensure thread safety with a double check lock From 3d0be3836c7b340adeb566bf7ea8cb45d5cac728 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 27 Mar 2013 11:13:56 -0100 Subject: [PATCH 2/5] Added tag release-4.11.6 for changeset 14338b0ab173 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6e92034f9e..7a418a8da9 100644 --- a/.hgtags +++ b/.hgtags @@ -27,3 +27,4 @@ e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1 e4d0c7e740555d8707ba71f55a623a3f96da8e65 Release-4.11.3.1 0000000000000000000000000000000000000000 Release-4.11.3.1 e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4 +14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6 From 52cf559536fd7d6c3e45dc4ab7b94e09b75da911 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 27 Mar 2013 12:00:18 -0100 Subject: [PATCH 3/5] Closing 4.11.6 branch From 27c0c4d64ed5dfad0c8714d748b20bd4701f6de0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 27 Mar 2013 14:47:35 -0100 Subject: [PATCH 4/5] Opening new branch From 5f4eaef4a2ec821117564977434d9c5943b46d56 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Fri, 29 Mar 2013 21:31:27 +0600 Subject: [PATCH 5/5] Fixes: #U4-2022 --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +- .../Application/HistoryManager.js | 26 +++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 3dbba44e9c..0b57950ed3 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2391,7 +2391,7 @@ xcopy "$(ProjectDir)"..\..\lib\SQLCE4\x86\*.* "$(TargetDir)x86\" /Y /F /E /DTrue 61637 / - http://localhost:61639/VirtualDir + http://localhost:61639 False False diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js b/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js index b258c61e8e..b1f44a8f46 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js +++ b/src/Umbraco.Web.UI/umbraco_client/Application/HistoryManager.js @@ -1,6 +1,6 @@ /// /// -/// +/// Umbraco.Sys.registerNamespace("Umbraco.Controls"); @@ -8,18 +8,28 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); Umbraco.Controls.HistoryManager = function() { /// This is a wrapper for the bbq plugin history manager, but we could do alot with history mgmt in the future! + + var hashFragmentRegex = new RegExp(/^\w+/); + function getHashFragment(frag) { + //tests for xss and ensures only the first alphanumeric chars are matched + var result = hashFragmentRegex.exec(frag); + if (result.length > 0) { + return result[0]; + } + return ""; + } var obj = { onNavigate: function(e) { - - var l = $.param.fragment(); - if (l != "") { - jQuery(window.top).trigger("navigating", [$.param.fragment()]); //raise event! + var fragment = getHashFragment($.param.fragment()); + if (fragment != "") { + jQuery(window.top).trigger("navigating", [fragment]); //raise event! } }, addHistory: function(name, forceRefresh) { - if ($.param.fragment() == name && forceRefresh) { + var fragment = getHashFragment($.param.fragment()); + if (fragment == name && forceRefresh) { this.onNavigate(); } else { @@ -27,8 +37,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); } }, - getCurrent: function() { - return ($.param.fragment().length > 0) ? $.param.fragment() : ""; + getCurrent: function () { + return getHashFragment($.param.fragment()); }, addEventHandler: function(fnName, fn) {