Merge branch 'hotfix/1.3.1'

GaryJones · Nov 8, 2014 · a5503ad · a5503ad
2 parents 841fd08 + 9423ffd
commit a5503ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/class-genesis-header-nav.php b/class-genesis-header-nav.php
@@ -36,8 +36,8 @@ class Genesis_Header_Nav {
 	 * @since 1.0.0
 	 */
 	private function __construct() {
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
-		add_action( 'genesis_setup', array( $this, 'register_nav_menu' ), 15 );
+		add_action( 'plugins_loaded', array( $this, 'load_plugin_textdomain' ) );
+		add_action( 'init', array( $this, 'register_nav_menu' ) );
 		add_action( 'genesis_header', array( $this, 'show_menu' ), apply_filters( 'genesis_header_nav_priority', 12 ) );
 		add_filter( 'body_class', array( $this, 'body_classes' ), 15 );
 	}

diff --git a/genesis-header-nav.php b/genesis-header-nav.php
@@ -12,7 +12,7 @@
  * Plugin Name:       Genesis Header Nav
  * Plugin URI:        https://github.com/GaryJones/genesis-header-nav
  * Description:       Registers a menu location and displays it inside the header for a Genesis Framework child theme.
- * Version:           1.3.0
+ * Version:           1.3.1
  * Author:            Gary Jones
  * Author URI:        http://gamajo.com/
  * Text Domain:       genesis-header-nav
@@ -30,4 +30,12 @@
 
 require_once plugin_dir_path( __FILE__ ) . 'class-genesis-header-nav.php';
 
-Genesis_Header_Nav::get_instance();
+add_action( 'after_setup_theme', 'genesis_header_nav_run' );
+/**
+ * Run the plugin.
+ *
+ * @since 1.3.1
+ */
+function genesis_header_nav_run() {
+	Genesis_Header_Nav::get_instance();
+}