Permalink
Browse files

Merge pull request #366 from niallkennedy/colorscheme

change social plugin property color_scheme to colorscheme
  • Loading branch information...
2 parents 4fe83a5 + d7ecf1a commit 76b6ed27e12dac62f7c51ab6dbd01441d2c441d8 @niallkennedy niallkennedy committed Jan 5, 2013
@@ -117,11 +117,11 @@ public static function color_scheme_choices( $name, $existing_value = 'light' )
if ( ! class_exists( 'Facebook_Social_Plugin' ) )
require_once( dirname( dirname(__FILE__) ) . '/social-plugins/class-facebook-social-plugin.php' );
- if ( ! ( is_string( $existing_value ) && $existing_value && in_array( $existing_value, Facebook_Social_Plugin::$color_scheme_choices, true ) ) )
+ if ( ! ( is_string( $existing_value ) && $existing_value && in_array( $existing_value, Facebook_Social_Plugin::$colorscheme_choices, true ) ) )
$existing_value = 'light';
$checkboxes = '';
- foreach( Facebook_Social_Plugin::$color_scheme_choices as $color_scheme ) {
+ foreach( Facebook_Social_Plugin::$colorscheme_choices as $color_scheme ) {
$checkboxes .= '<label';
// match background color and text color of the Facebook color scheme options
// provides a hint of final display. May change but possibly helpful in making a decision
@@ -36,18 +36,18 @@ class Facebook_Comments_Box {
/**
* Choose a light or dark color scheme to match your site style
*
- * @since 1.1
+ * @since 1.1.11
* @param string
*/
- protected $color_scheme;
+ protected $colorscheme;
/**
* Use a light or dark color scheme
*
- * @since 1.1
+ * @since 1.1.11
* @var array
*/
- public static $color_scheme_choices = array( 'light', 'dark' );
+ public static $colorscheme_choices = array( 'light', 'dark' );
/**
* The number of comments to show by default
@@ -105,13 +105,13 @@ public function setWidth( $width ) {
* Choose a light or dark color scheme
*
* @since 1.1
- * @see self::color_scheme_choices
+ * @see self::colorscheme_choices
* @param string $color_scheme light|dark
* @return Facebook_Comments_Box support chaining
*/
public function setColorScheme( $color_scheme ) {
- if ( is_string( $color_scheme ) && in_array( $color_scheme, self::$color_scheme_choices, true ) )
- $this->color_scheme = $color_scheme;
+ if ( is_string( $color_scheme ) && in_array( $color_scheme, self::$colorscheme_choices, true ) )
+ $this->colorscheme = $color_scheme;
return $this;
}
@@ -185,8 +185,8 @@ public function toHTMLDataArray() {
if ( isset( $this->width ) && is_int( $this->width ) && $this->width > 0 )
$data['width'] = $this->width;
- if ( isset( $this->color_scheme ) && $this->color_scheme !== 'light' )
- $data['colorscheme'] = $this->color_scheme;
+ if ( isset( $this->colorscheme ) && $this->colorscheme !== 'light' )
+ $data['colorscheme'] = $this->colorscheme;
if ( isset( $this->num_posts ) && is_int( $this->num_posts ) && $this->num_posts > 0 && $this->num_posts !== 10 )
$data['num-posts'] = $this->num_posts;
@@ -29,15 +29,15 @@ class Facebook_Social_Plugin {
* @since 1.1
* @param string
*/
- protected $color_scheme;
+ protected $colorscheme;
/**
* Use a light or dark color scheme
*
* @since 1.1
* @var array
*/
- public static $color_scheme_choices = array( 'light', 'dark' );
+ public static $colorscheme_choices = array( 'light', 'dark' );
/**
* Add a unique reference to track referrals. Facebook passes this parameter to the destination URL when a Facebook user clicks the link.
@@ -66,12 +66,12 @@ public function setFont( $font ) {
* Choose a light or dark color scheme
*
* @since 1.1
- * @see self::color_scheme_choices
+ * @see self::colorscheme_choices
* @param string $color_scheme light|dark
* @return Facebook_Social_Plugin support chaining
*/
public function setColorScheme( $color_scheme ) {
- if ( is_string( $color_scheme ) && in_array( $color_scheme, self::$color_scheme_choices, true ) )
+ if ( is_string( $color_scheme ) && in_array( $color_scheme, self::$colorscheme_choices, true ) )
$this->colorscheme = $color_scheme;
return $this;
}

0 comments on commit 76b6ed2

Please sign in to comment.