tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '0.2' into 0.3

This commit is contained in:
Daniel Hensby 2018-02-20 13:11:09 +00:00
parent a6734d3609 26ad18d385
commit 5e05ac92e5
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/BlogHolder.php
View File

@ -131,7 +131,7 @@ class BlogHolder extends BlogTree implements PermissionProvider {
}
class BlogHolder_Controller extends BlogTree_Controller {
static $allowed_actions = array(
'index',
'tag',
@ -139,7 +139,7 @@ class BlogHolder_Controller extends BlogTree_Controller {
'post' => 'BLOGMANAGEMENT',
'BlogEntryForm' => 'BLOGMANAGEMENT',
);
function init() {
parent::init();
Requirements::themedCSS("bbcodehelp");
@ -149,9 +149,9 @@ class BlogHolder_Controller extends BlogTree_Controller {
* TODO: this is an urgent fix to work with archive link (e.g. page_url/2009/04). Replace this with something better.
*/
function checkAccessAction($action) {
if (preg_match('/[0-9]{4}/', $action))
if (preg_match('/[0-9]{4}/', $action))
{
return true;
return true;
}
return parent::checkAccessAction($action);
}