tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-07-03 09:59:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
ajshort 2011-04-26 11:07:11 +10:00
commit 57f47af6c0
2 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/model/ErrorPage.php
View File

@ -63,6 +63,7 @@ class ErrorPage extends Page {
function requireDefaultRecords() {
parent::requireDefaultRecords();
if ($this->class == 'ErrorPage' && SiteTree::get_create_default_pages()) {
// Ensure that an assets path exists before we do any error page creation
if(!file_exists(ASSETS_PATH)) {
mkdir(ASSETS_PATH);
@ -122,6 +123,7 @@ class ErrorPage extends Page {
}
}
}
}
function getCMSFields() {
$fields = parent::getCMSFields();

11
code/model/SiteTree.php
View File

@ -228,6 +228,15 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
self::$create_default_pages = $option;
}
/**
* Return true if default pages should be created on /dev/build.
*
* @return bool
*/
public static function get_create_default_pages() {
return self::$create_default_pages;
}
/**
* Fetches the {@link SiteTree} object that maps to a link.
*
@ -1291,7 +1300,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
parent::requireDefaultRecords();
// default pages
if($this->class == 'SiteTree' && self::$create_default_pages) {
if($this->class == 'SiteTree' && self::get_create_default_pages()) {
if(!SiteTree::get_by_link('home')) {
$homepage = new Page();
$homepage->Title = _t('SiteTree.DEFAULTHOMETITLE', 'Home');