tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-29 12:49:00 +02:00
Code Issues Projects Releases Wiki Activity

FIXED: Coding style inconsistencies

Browse Source
This commit is contained in:
Damian Mooyman 2012-08-24 08:25:14 +12:00
parent 6395f9030e
commit 715b60387c
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/model/SiteConfig.php
View File

@ -159,8 +159,7 @@ class SiteConfig extends DataObject implements PermissionProvider {
* @return SiteConfig * @return SiteConfig
*/ */
static function current_site_config() { static function current_site_config() {
if ($siteConfig = DataObject::get_one('SiteConfig')) if ($siteConfig = DataObject::get_one('SiteConfig')) return $siteConfig;
return $siteConfig;
return self::make_site_config(); return self::make_site_config();
} }

3
code/model/SiteTree.php
View File

@ -994,8 +994,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if($this->hasMethod('alternateSiteConfig')) { if($this->hasMethod('alternateSiteConfig')) {
$altConfig = $this->alternateSiteConfig(); $altConfig = $this->alternateSiteConfig();
if($altConfig) if($altConfig) return $altConfig;
return $altConfig;
} }
return SiteConfig::current_site_config(); return SiteConfig::current_site_config();