From a4c5b7118df15b0017bdc288d0f9e68ecaff1d0a Mon Sep 17 00:00:00 2001 From: Nathan Woulfe Date: Sat, 26 Jan 2019 20:50:19 +1000 Subject: [PATCH 1/3] check for editorstate.current before attempting to access properties object --- .../src/views/propertyeditors/rte/rte.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index 212db4fc31..2b81521ca9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -278,7 +278,7 @@ angular.module("umbraco") $scope.linkPickerOverlay = { view: "linkpicker", currentTarget: currentTarget, - anchors: tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)), + anchors: editorState.current ? tinyMceService.getAnchorNames(JSON.stringify(editorState.current.properties)) : [], show: true, submit: function(model) { tinyMceService.insertLinkInEditor(editor, model.target, anchorElement); From df20feb70395a31addc6bb3e31493d2cf29e427b Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Tue, 8 Jan 2019 10:31:44 +0100 Subject: [PATCH 2/3] Make cache properties on PublishedContentRequest public --- src/Umbraco.Web/Routing/PublishedContentRequest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web/Routing/PublishedContentRequest.cs b/src/Umbraco.Web/Routing/PublishedContentRequest.cs index 3598d5ff8d..ef55b51767 100644 --- a/src/Umbraco.Web/Routing/PublishedContentRequest.cs +++ b/src/Umbraco.Web/Routing/PublishedContentRequest.cs @@ -613,13 +613,13 @@ namespace Umbraco.Web.Routing // Note: we used to set a default value here but that would then be the default // for ALL requests, we shouldn't overwrite it though if people are using [OutputCache] for example // see: https://our.umbraco.com/forum/using-umbraco-and-getting-started/79715-output-cache-in-umbraco-752 - internal HttpCacheability Cacheability { get; set; } + public HttpCacheability Cacheability { get; set; } /// /// Gets or sets a list of Extensions to append to the Response.Cache object /// private List _cacheExtensions = new List(); - internal List CacheExtensions + public List CacheExtensions { get { return _cacheExtensions; } set { _cacheExtensions = value; } @@ -629,7 +629,7 @@ namespace Umbraco.Web.Routing /// Gets or sets a dictionary of Headers to append to the Response object /// private Dictionary _headers = new Dictionary(); - internal Dictionary Headers + public Dictionary Headers { get { return _headers; } set { _headers = value; } @@ -640,4 +640,4 @@ namespace Umbraco.Web.Routing /// public bool IgnorePublishedContentCollisions { get; set; } } -} \ No newline at end of file +} From d174499e50f6ab84dba1600374371bb48fd5ad8a Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sun, 27 Jan 2019 13:30:25 +0100 Subject: [PATCH 3/3] Fixes #4260 incorrect permissions required for Notifications sign up --- src/Umbraco.Web/Editors/ContentController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index c77fe04b0d..5f3022b2a9 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -1179,7 +1179,7 @@ namespace Umbraco.Web.Editors return allowed; } - [EnsureUserPermissionForContent("contentId", 'R')] + [EnsureUserPermissionForContent("contentId", 'F')] public IEnumerable GetNotificationOptions(int contentId) { var notifications = new List();