Merge branch 'fix/bug-inc-classes' into feature/GH-33-dir-classes

rtCamp · Jan 24, 2020 · 09474a6 · 09474a6
2 parents 1fd953a + ff3f0a9
commit 09474a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/inc/classes/class-blank-theme.php b/inc/classes/class-blank-theme.php
@@ -27,7 +27,6 @@ protected function __construct() {
 		Widgets::get_instance();
 
 		$this->_setup_hooks();
-		$this->_setup_theme();
 
 	}
 
@@ -48,6 +47,7 @@ protected function _setup_hooks() {
 		 * Actions
 		 */
 		add_action( 'wp_head', [ $this, 'add_pingback_link' ] );
+		add_action( 'after_setup_theme', [ $this, 'setup_theme' ] );
 
 	}
 
@@ -56,7 +56,7 @@ protected function _setup_hooks() {
 	 *
 	 * @return void
 	 */
-	protected function _setup_theme() {
+	public function setup_theme() {
 
 		load_theme_textdomain( 'blank-theme', BLANK_THEME_TEMP_DIR . '/languages' );
 
@@ -122,9 +122,6 @@ protected function _setup_theme() {
 			]
 		);
 
-		if ( ! isset( $content_width ) ) {
-			$content_width = 900;
-		}
 	}
 
 	/**
@@ -172,7 +169,7 @@ public function filter_body_classes( $classes ) {
 	 */
 	public function add_pingback_link() {
 		if ( is_singular() && pings_open() ) {
-			echo '<link rel="pingback" href="', esc_url( get_bloginfo( 'pingback_url' ) ), '">';
+			echo '<link rel="pingback" href="' . esc_url( get_bloginfo( 'pingback_url' ) ) . '">';
 		}
 	}
 

diff --git a/inc/classes/class-infinite-scroll.php b/inc/classes/class-infinite-scroll.php
@@ -5,12 +5,14 @@
  * @package Blank-Theme
  */
 
-namespace Blank_Theme;
+namespace BLANK_THEME\Inc;
+
+use Blank_Theme\Inc\Traits\Singleton;
 
 /**
  * Class Infinite_Scroll
  */
-class Infinite_Scroll extends Base {
+class Infinite_Scroll {
 
 	/**
 	 * Setup Jetpack for infinite theme support.