lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 20:13:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix build errors after merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-04-13 11:25:11 -07:00
parent 6c74a37693
commit ca47a0b8fb
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs
View File

@@ -1,5 +1,5 @@
using NUnit.Framework; using NUnit.Framework;
using Orchard.Extensions; using Orchard.Utility.Extensions;
namespace Orchard.Tests.Utility.Extensions { namespace Orchard.Tests.Utility.Extensions {
[TestFixture] [TestFixture]

2
src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
View File

@@ -3,12 +3,12 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.Extensions;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Media.Models; using Orchard.Media.Models;
using Orchard.Media.Services; using Orchard.Media.Services;
using Orchard.Media.ViewModels; using Orchard.Media.ViewModels;
using Orchard.UI.Notify; using Orchard.UI.Notify;
using Orchard.Utility.Extensions;
namespace Orchard.Media.Controllers { namespace Orchard.Media.Controllers {
[ValidateInput(false)] [ValidateInput(false)]

4
src/Orchard/Utility/Extensions/StringExtensions.cs
View File

@@ -14,5 +14,9 @@ namespace Orchard.Utility.Extensions {
return cleanTailRegex.Replace(text.Substring(0, characterCount + 1), "") + ellipsis; return cleanTailRegex.Replace(text.Substring(0, characterCount + 1), "") + ellipsis;
} }
public static bool IsNullOrEmptyTrimmed(this string text) {
if (text == null) return true;
return string.IsNullOrEmpty(text.Trim());
}
} }
} }