diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 41f1960bd..f9647e4ba 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -963,7 +963,7 @@ jQuery.noConflict(); }(jQuery)); var statusMessage = function(text, type) { - text = $('
').text(text).html(); // Escape HTML entities in text + text = jQuery('
').text(text).html(); // Escape HTML entities in text jQuery.noticeAdd({text: text, type: type}); }; diff --git a/docs/en/changelogs/3.0.5.md b/docs/en/changelogs/3.0.5.md new file mode 100644 index 000000000..d7fc834dc --- /dev/null +++ b/docs/en/changelogs/3.0.5.md @@ -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) \ No newline at end of file diff --git a/forms/Form.php b/forms/Form.php index 151a7d371..f64e5622a 100644 --- a/forms/Form.php +++ b/forms/Form.php @@ -289,7 +289,7 @@ class Form extends RequestHandler { $this->controller->hasMethod($funcName) && !$this->controller->checkAccessAction($funcName) // If a button exists, allow it on the controller - && !$this->actions->fieldByName('action_' . $funcName) + && !$this->actions->dataFieldByName('action_' . $funcName) ) { return $this->httpError( 403,