Use "get" prefix for StyleInterface::defaultStyle

This commit is contained in:
Dmitriy Simushev 2014-03-04 14:19:43 +00:00
parent 8fe93ec779
commit f467c35bd3
5 changed files with 10 additions and 10 deletions

View File

@ -106,7 +106,7 @@ class ChatStyle extends AbstractStyle implements StyleInterface
$style_name = verify_param("style", "/^\w+$/", ""); $style_name = verify_param("style", "/^\w+$/", "");
if (!$style_name) { if (!$style_name) {
// Use the default style // Use the default style
$style_name = self::defaultStyle(); $style_name = self::getDefaultStyle();
} }
// Get all style list and make sure that in has at least one style. // Get all style list and make sure that in has at least one style.
@ -132,7 +132,7 @@ class ChatStyle extends AbstractStyle implements StyleInterface
* *
* @return string Name of a style * @return string Name of a style
*/ */
public static function defaultStyle() public static function getDefaultStyle()
{ {
// Load value from system settings // Load value from system settings
return Settings::get('chat_style'); return Settings::get('chat_style');

View File

@ -68,7 +68,7 @@ class InvitationStyle extends AbstractStyle implements StyleInterface
public static function getCurrentStyle() public static function getCurrentStyle()
{ {
// Just use the default style // Just use the default style
return self::defaultStyle(); return self::getDefaultStyle();
} }
/** /**
@ -76,7 +76,7 @@ class InvitationStyle extends AbstractStyle implements StyleInterface
* *
* @return string Name of a style * @return string Name of a style
*/ */
public static function defaultStyle() public static function getDefaultStyle()
{ {
// Load value from system settings // Load value from system settings
return Settings::get('invitation_style'); return Settings::get('invitation_style');

View File

@ -103,7 +103,7 @@ class PageStyle extends AbstractStyle implements StyleInterface
public static function getCurrentStyle() public static function getCurrentStyle()
{ {
// Just use the default style // Just use the default style
return self::defaultStyle(); return self::getDefaultStyle();
} }
/** /**
@ -111,7 +111,7 @@ class PageStyle extends AbstractStyle implements StyleInterface
* *
* @return string Name of a style * @return string Name of a style
*/ */
public static function defaultStyle() public static function getDefaultStyle()
{ {
// Load value from system settings // Load value from system settings
return Settings::get('page_style'); return Settings::get('page_style');

View File

@ -38,7 +38,7 @@ interface StyleInterface
* *
* @return string Name of a style * @return string Name of a style
*/ */
public static function defaultStyle(); public static function getDefaultStyle();
/** /**
* Sets style which is used in the system by default * Sets style which is used in the system by default

View File

@ -57,15 +57,15 @@ foreach ($options as $opt) {
// Load styles configs // Load styles configs
$styles_params = array( $styles_params = array(
'chat_style' => ChatStyle::defaultStyle(), 'chat_style' => ChatStyle::getDefaultStyle(),
'page_style' => PageStyle::defaultStyle(), 'page_style' => PageStyle::getDefaultStyle(),
); );
$chat_style_list = ChatStyle::getAvailableStyles(); $chat_style_list = ChatStyle::getAvailableStyles();
$page_style_list = PageStyle::getAvailableStyles(); $page_style_list = PageStyle::getAvailableStyles();
if (Settings::get('enabletracking')) { if (Settings::get('enabletracking')) {
$styles_params['invitation_style'] = InvitationStyle::defaultStyle(); $styles_params['invitation_style'] = InvitationStyle::getDefaultStyle();
$invitation_style_list = InvitationStyle::getAvailableStyles(); $invitation_style_list = InvitationStyle::getAvailableStyles();
} }