tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge tag '3.0.5' into 3.0

Browse Source
This commit is contained in:
Ingo Schommer 2013-02-20 02:21:41 +01:00
commit 25af4adce2
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/javascript/LeftAndMain.js
View File

@ -963,7 +963,7 @@ jQuery.noConflict();
}(jQuery)); }(jQuery));
var statusMessage = function(text, type) { var statusMessage = function(text, type) {
text = $('<div/>').text(text).html(); // Escape HTML entities in text text = jQuery('<div/>').text(text).html(); // Escape HTML entities in text
jQuery.noticeAdd({text: text, type: type}); jQuery.noticeAdd({text: text, type: type});
}; };

13
docs/en/changelogs/3.0.5.md Normal file
View File

@ -0,0 +1,13 @@
# 3.0.5 (2013-02-20)
## Overview
* Fixes unpublish and "delete" actions in CMS (regression from $allowed_actions changes in 3.0.4)
### Bugfixes
* 2013-02-18 [16d0c18](https://github.com/silverstripe/sapphire/commit/16d0c18) Find Form actions in CompositeFields for access checks (Ingo Schommer)
### Other
* 2013-02-19 [9e7c622](https://github.com/silverstripe/sapphire/commit/9e7c622) fixed error property $ of object is not a function (roed)

2
forms/Form.php
View File

@ -289,7 +289,7 @@ class Form extends RequestHandler {
$this->controller->hasMethod($funcName) $this->controller->hasMethod($funcName)
&& !$this->controller->checkAccessAction($funcName) && !$this->controller->checkAccessAction($funcName)
// If a button exists, allow it on the controller // If a button exists, allow it on the controller
&& !$this->actions->fieldByName('action_' . $funcName) && !$this->actions->dataFieldByName('action_' . $funcName)
) { ) {
return $this->httpError( return $this->httpError(
403, 403,