lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
This commit is contained in:
Sipke Schoorstra
2015-07-09 17:23:13 +01:00
parent b6db85b8af 784e1c0961
commit 298b2fb930
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml
View File

@@ -18,7 +18,7 @@
var isLatest = contentItem.VersionRecord.Number == eventVersionNumber; var isLatest = contentItem.VersionRecord.Number == eventVersionNumber;
var isRemoved = !contentItem.VersionRecord.Latest && !contentItem.VersionRecord.Published; var isRemoved = !contentItem.VersionRecord.Latest && !contentItem.VersionRecord.Published;
if (isPublishedEvent || isLatest) { if (isPublishedEvent || isLatest) {
@T("{0} of the {1} {2} was {3}.", Html.ActionLink(T("Version {0}", eventVersionNumber).Text, "Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItemId, version = eventVersionNumber }, null), contentType.ToLower(), isRemoved ? "<strong>" + title + "</strong>" : Html.ItemEditLink(title, contentItemId).ToString(), eventPastTense) @T("{0} of the {1} {2} was {3}.", Html.ActionLink(T("Version {0}", eventVersionNumber).Text, "Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItemId, version = eventVersionNumber }, null), contentType.ToLower(), isRemoved ? Html.Raw("<strong>" + title + "</strong>") : Html.ItemEditLink(title, contentItemId), eventPastTense)
} }
else if (isRemoved) { else if (isRemoved) {
@T("The {0} <strong>{1}</strong> was {2}.", contentType.ToLower(), title, eventPastTense) @T("The {0} <strong>{1}</strong> was {2}.", contentType.ToLower(), title, eventPastTense)

4
src/Orchard.Web/Modules/Orchard.MediaLibrary/Fields/MediaLibraryPickerField.cs
View File

@@ -7,7 +7,7 @@ using Orchard.MediaLibrary.Models;
namespace Orchard.MediaLibrary.Fields { namespace Orchard.MediaLibrary.Fields {
public class MediaLibraryPickerField : ContentField { public class MediaLibraryPickerField : ContentField {
private static readonly char[] separator = new [] {'{', '}', ','}; private static readonly char[] separator = {'{', '}', ','};
internal Lazy<IEnumerable<MediaPart>> _contentItems; internal Lazy<IEnumerable<MediaPart>> _contentItems;
public int[] Ids { public int[] Ids {
@@ -17,7 +17,7 @@ namespace Orchard.MediaLibrary.Fields {
public IEnumerable<MediaPart> MediaParts { public IEnumerable<MediaPart> MediaParts {
get { get {
return _contentItems.Value; return _contentItems != null ? _contentItems.Value : Enumerable.Empty<MediaPart>();
} }
} }