mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-06-23 21:19:24 +02:00
FIXED: Coding style inconsistencies
This commit is contained in:
parent
6395f9030e
commit
715b60387c
|
@ -50,25 +50,25 @@ class SiteConfig extends DataObject implements PermissionProvider {
|
|||
asort($groupsMap);
|
||||
|
||||
$fields = new FieldList(
|
||||
new TabSet("Root",
|
||||
$tabMain = new Tab('Main',
|
||||
$titleField = new TextField("Title", _t('SiteConfig.SITETITLE', "Site title")),
|
||||
$taglineField = new TextField("Tagline", _t('SiteConfig.SITETAGLINE', "Site Tagline/Slogan")),
|
||||
$themeDropdownField = new DropdownField("Theme", _t('SiteConfig.THEME', 'Theme'), $this->getAvailableThemes())
|
||||
),
|
||||
$tabAccess = new Tab('Access',
|
||||
$viewersOptionsField = new OptionsetField("CanViewType", _t('SiteConfig.VIEWHEADER', "Who can view pages on this site?")),
|
||||
$viewerGroupsField = ListboxField::create("ViewerGroups", _t('SiteTree.VIEWERGROUPS', "Viewer Groups"))
|
||||
->setMultiple(true)->setSource($groupsMap),
|
||||
$editorsOptionsField = new OptionsetField("CanEditType", _t('SiteConfig.EDITHEADER', "Who can edit pages on this site?")),
|
||||
$editorGroupsField = ListboxField::create("EditorGroups", _t('SiteTree.EDITORGROUPS', "Editor Groups"))
|
||||
->setMultiple(true)->setSource($groupsMap),
|
||||
$topLevelCreatorsOptionsField = new OptionsetField("CanCreateTopLevelType", _t('SiteConfig.TOPLEVELCREATE', "Who can create pages in the root of the site?")),
|
||||
$topLevelCreatorsGroupsField = ListboxField::create("CreateTopLevelGroups", _t('SiteTree.TOPLEVELCREATORGROUPS', "Top level creators"))
|
||||
->setMultiple(true)->setSource($groupsMap)
|
||||
)
|
||||
),
|
||||
new HiddenField('ID')
|
||||
new TabSet("Root",
|
||||
$tabMain = new Tab('Main',
|
||||
$titleField = new TextField("Title", _t('SiteConfig.SITETITLE', "Site title")),
|
||||
$taglineField = new TextField("Tagline", _t('SiteConfig.SITETAGLINE', "Site Tagline/Slogan")),
|
||||
$themeDropdownField = new DropdownField("Theme", _t('SiteConfig.THEME', 'Theme'), $this->getAvailableThemes())
|
||||
),
|
||||
$tabAccess = new Tab('Access',
|
||||
$viewersOptionsField = new OptionsetField("CanViewType", _t('SiteConfig.VIEWHEADER', "Who can view pages on this site?")),
|
||||
$viewerGroupsField = ListboxField::create("ViewerGroups", _t('SiteTree.VIEWERGROUPS', "Viewer Groups"))
|
||||
->setMultiple(true)->setSource($groupsMap),
|
||||
$editorsOptionsField = new OptionsetField("CanEditType", _t('SiteConfig.EDITHEADER', "Who can edit pages on this site?")),
|
||||
$editorGroupsField = ListboxField::create("EditorGroups", _t('SiteTree.EDITORGROUPS', "Editor Groups"))
|
||||
->setMultiple(true)->setSource($groupsMap),
|
||||
$topLevelCreatorsOptionsField = new OptionsetField("CanCreateTopLevelType", _t('SiteConfig.TOPLEVELCREATE', "Who can create pages in the root of the site?")),
|
||||
$topLevelCreatorsGroupsField = ListboxField::create("CreateTopLevelGroups", _t('SiteTree.TOPLEVELCREATORGROUPS', "Top level creators"))
|
||||
->setMultiple(true)->setSource($groupsMap)
|
||||
)
|
||||
),
|
||||
new HiddenField('ID')
|
||||
);
|
||||
|
||||
$themeDropdownField->setEmptyString(_t('SiteConfig.DEFAULTTHEME', '(Use default theme)'));
|
||||
|
@ -159,9 +159,8 @@ class SiteConfig extends DataObject implements PermissionProvider {
|
|||
* @return SiteConfig
|
||||
*/
|
||||
static function current_site_config() {
|
||||
if ($siteConfig = DataObject::get_one('SiteConfig'))
|
||||
return $siteConfig;
|
||||
|
||||
if ($siteConfig = DataObject::get_one('SiteConfig')) return $siteConfig;
|
||||
|
||||
return self::make_site_config();
|
||||
}
|
||||
|
||||
|
|
|
@ -994,8 +994,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
|
|||
|
||||
if($this->hasMethod('alternateSiteConfig')) {
|
||||
$altConfig = $this->alternateSiteConfig();
|
||||
if($altConfig)
|
||||
return $altConfig;
|
||||
if($altConfig) return $altConfig;
|
||||
}
|
||||
|
||||
return SiteConfig::current_site_config();
|
||||
|
|
Loading…
Reference in New Issue
Block a user