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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-11-19 11:14:18 -08:00
parent f815a69368 c9bfabbd2b
commit 00579ede40
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Scheduling/Services/ScheduledTaskManager.cs
View File

@@ -45,7 +45,7 @@ namespace Orchard.Core.Scheduling.Services {
}
public IEnumerable<IScheduledTask> GetTasks(string taskType, DateTime? scheduledBeforeUtc = null) {
var query = scheduledBeforeUtc == null
var query = scheduledBeforeUtc != null
? _repository.Fetch(t => t.TaskType == taskType && t.ScheduledUtc <= scheduledBeforeUtc)
: _repository.Fetch(t => t.TaskType == taskType);

2
src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
View File

@@ -43,7 +43,7 @@ namespace Orchard.Comments.Controllers {
CommentedOn = viewModel.CommentedOn
};
if (!context.SiteName.StartsWith("http://") && !context.SiteName.StartsWith("https://")) {
if (!String.IsNullOrEmpty(context.SiteName) && !context.SiteName.StartsWith("http://") && !context.SiteName.StartsWith("https://")) {
context.SiteName = "http://" + context.SiteName;
}