Merge branch '3.5' into 3.6

This commit is contained in:
Daniel Hensby 2018-05-01 20:23:21 +01:00
commit cda61fb1ec
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -576,7 +576,7 @@ class HtmlEditorField_Toolbar extends RequestHandler {
$id = (int)$this->getRequest()->getVar('PageID');
$anchors = array();
if (($page = Page::get()->byID($id)) && !empty($page)) {
if (($page = SiteTree::get()->byID($id)) && !empty($page)) {
if (!$page->canView()) {
throw new SS_HTTPResponse_Exception(
_t(