lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix illegal characters bug when reading Settings.txt with LF line endings

Browse Source 
--HG--
branch : 1.x
extra : transplant_source : %EE%25%C4%22%FBL%D9%8E%8A%E8%C7%25%A8x%27A%B7%D4%06%D2
This commit is contained in:
Ben Keeping
2011-08-12 15:48:26 +01:00
parent a1b0ce3909
commit c54df43b9a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard/Environment/Configuration/ShellSettingsManager.cs
View File

@@ -54,8 +54,11 @@ namespace Orchard.Environment.Configuration {
if (String.IsNullOrEmpty(text)) if (String.IsNullOrEmpty(text))
return shellSettings; return shellSettings;
var settings = text.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries); var settings = new StringReader(text);
foreach (var setting in settings) { string setting;
while ((setting = settings.ReadLine()) != null)
{
if (string.IsNullOrWhiteSpace(setting)) continue; ;
var separatorIndex = setting.IndexOf(Separator); var separatorIndex = setting.IndexOf(Separator);
if (separatorIndex == -1) if (separatorIndex == -1)
{ {