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

Merge remote-tracking branch 'origin/1.0' into 1 

# Conflicts:
#	composer.json
This commit is contained in:
Ingo Schommer 2017-11-20 16:10:28 +13:00
parent c67d507737 80ce526563
commit 6874d169d8
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -5,7 +5,7 @@
"homepage": "http://silverstripe.org", "homepage": "http://silverstripe.org",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"require": { "require": {
"silverstripe/recipe-plugin": ">=0.1@dev <1.0", "silverstripe/recipe-plugin": "^1",
"silverstripe/recipe-core": "1.1.x-dev", "silverstripe/recipe-core": "1.1.x-dev",
"silverstripe/admin": "1.1.x-dev", "silverstripe/admin": "1.1.x-dev",
"silverstripe/asset-admin": "1.1.x-dev", "silverstripe/asset-admin": "1.1.x-dev",
@ -34,4 +34,4 @@
}, },
"prefer-stable": true, "prefer-stable": true,
"minimum-stability": "dev" "minimum-stability": "dev"
} }

6
mysite/code/Page.php
View File

@ -4,9 +4,7 @@ use SilverStripe\CMS\Model\SiteTree;
class Page extends SiteTree class Page extends SiteTree
{ {
private static $db = array( private static $db = [];
);
private static $has_one = array( private static $has_one = [];
);
} }

8
mysite/code/PageController.php
View File

@ -9,19 +9,17 @@ class PageController extends ContentController
* permissions or conditions required to allow the user to access it. * permissions or conditions required to allow the user to access it.
* *
* <code> * <code>
* array ( * [
* 'action', // anyone can access this action * 'action', // anyone can access this action
* 'action' => true, // same as above * 'action' => true, // same as above
* 'action' => 'ADMIN', // you must have ADMIN permissions to access this action * 'action' => 'ADMIN', // you must have ADMIN permissions to access this action
* 'action' => '->checkAction' // you can only access this action if $this->checkAction() returns true * 'action' => '->checkAction' // you can only access this action if $this->checkAction() returns true
* ); * ];
* </code> * </code>
* *
* @var array * @var array
*/ */
private static $allowed_actions = array( private static $allowed_actions = [];
);
protected function init() protected function init()
{ {