From 02c23c41feb2683a454990b6ed0528949003aec5 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 26 Jul 2015 16:21:14 -0400
Subject: [PATCH] Fix calls to get_option

---
 includes/class-displayfeaturedimagegenesis-admin.php  | 6 +++---
 includes/class-displayfeaturedimagegenesis-author.php | 2 +-
 includes/class-displayfeaturedimagegenesis-rss.php    | 3 ++-
 includes/class-displayfeaturedimagegenesis.php        | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/includes/class-displayfeaturedimagegenesis-admin.php b/includes/class-displayfeaturedimagegenesis-admin.php
index 2647b81..4d6feae 100644
--- a/includes/class-displayfeaturedimagegenesis-admin.php
+++ b/includes/class-displayfeaturedimagegenesis-admin.php
@@ -16,7 +16,7 @@ class Display_Featured_Image_Genesis_Admin {
 	protected $common;
 
 	public function set_up_columns() {
-		$this->common = new Display_Featured_Image_Genesis_Common( $common = '' );
+		$this->common = new Display_Featured_Image_Genesis_Common();
 		$this->set_up_taxonomy_columns();
 		$this->set_up_post_type_columns();
 
@@ -28,7 +28,7 @@ class Display_Featured_Image_Genesis_Admin {
 	 *
 	 * @since  2.0.0
 	 */
-	public function set_up_taxonomy_columns() {
+	protected function set_up_taxonomy_columns() {
 		$args       = array(
 			'public' => true,
 		);
@@ -45,7 +45,7 @@ class Display_Featured_Image_Genesis_Admin {
 	 *
 	 * @since  2.0.0
 	 */
-	public function set_up_post_type_columns() {
+	protected function set_up_post_type_columns() {
 		$args       = array(
 			'public'   => true,
 			'_builtin' => false,
diff --git a/includes/class-displayfeaturedimagegenesis-author.php b/includes/class-displayfeaturedimagegenesis-author.php
index 69238be..e2dcaae 100644
--- a/includes/class-displayfeaturedimagegenesis-author.php
+++ b/includes/class-displayfeaturedimagegenesis-author.php
@@ -12,7 +12,7 @@ class Display_Featured_Image_Genesis_Author {
 	 */
 	public function set_author_meta() {
 
-		$this->settings = new Display_Featured_Image_Genesis_Settings( $common = '' );
+		$this->settings = new Display_Featured_Image_Genesis_Settings();
 		$this->name     = 'displayfeaturedimagegenesis';
 		// current user
 		add_action( 'profile_personal_options', array( $this, 'do_author_fields' ) );
diff --git a/includes/class-displayfeaturedimagegenesis-rss.php b/includes/class-displayfeaturedimagegenesis-rss.php
index 27e8cc4..0b7bd3f 100644
--- a/includes/class-displayfeaturedimagegenesis-rss.php
+++ b/includes/class-displayfeaturedimagegenesis-rss.php
@@ -17,7 +17,8 @@ class Display_Featured_Image_Genesis_RSS {
 	 */
 	public function maybe_do_feed() {
 
-		$displaysetting = get_option( 'displayfeaturedimagegenesis' );
+		$settings       = new Display_Featured_Image_Genesis_Settings();
+		$displaysetting = $settings->get_display_setting();
 		$feed_image     = $displaysetting['feed_image'];
 		$rss_option     = get_option( 'rss_use_excerpt' );
 		$post_types     = array();
diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php
index f99ee27..12bf41c 100644
--- a/includes/class-displayfeaturedimagegenesis.php
+++ b/includes/class-displayfeaturedimagegenesis.php
@@ -35,7 +35,7 @@ class Display_Featured_Image_Genesis {
 
 		require plugin_dir_path( __FILE__ ) . 'helper-functions.php';
 
-		add_action( 'init', array( $this, 'add_plugin_supports' ) );
+		add_action( 'after_setup_theme', array( $this, 'add_plugin_supports' ) );
 		add_action( 'admin_init', array( $this, 'check_settings' ) );
 		add_action( 'admin_init', array( $this->taxonomies, 'set_taxonomy_meta' ) );
 		add_action( 'admin_init', array( $this->author, 'set_author_meta' ) );
@@ -91,7 +91,7 @@ class Display_Featured_Image_Genesis {
 	 *
 	 * @since 1.3.0
 	 */
-	function add_plugin_supports() {
+	public function add_plugin_supports() {
 		add_image_size( 'displayfeaturedimage_backstretch', 2000, 2000, false );
 
 		$displaysetting = get_option( 'displayfeaturedimagegenesis' );