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

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

Browse Source 
Conflicts:
	src/Umbraco.Core/DatabaseContext.cs
	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs
This commit is contained in:
Stephan
2013-12-13 13:05:10 +01:00
parent 8a3eae9ea6 5aec753859
commit 98c8d637f4
8 changed files with 772 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/StringExtensions.cs
View File

@@ -866,9 +866,11 @@ namespace Umbraco.Core
if (_helper != null)
return _helper;
// there *has* to be a short string helper, even if the resolver has not
// been initialized - used the default one with default configuration.
_helper = new DefaultShortStringHelper().WithConfig(allowLeadingDigits: true);
// we don't want Umbraco to die because the resolver hasn't been initialized
// as the ShortStringHelper is too important, so as long as it's not there
// already, we use a default one. That should never happen, but...
Logging.LogHelper.Warn<IShortStringHelper>("ShortStringHelperResolver.HasCurrent == false, fallback to default.");
_helper = new DefaultShortStringHelper().WithDefaultConfig();
_helper.Freeze();
return _helper;
}