From 5300ec9601f3407bb765ace31d461d136213b5f9 Mon Sep 17 00:00:00 2001 From: Nick Croft Date: Fri, 20 Jun 2014 09:59:55 -0400 Subject: [PATCH] Updated to simplify admin load added a class exist check before requiring the admin.php file to ensure that the class will exist and removed the genesis_admin_menu hook to simplify issues when working with the global admin class object. --- includes/admin.php | 14 ++------------ plugin.php | 4 +++- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/includes/admin.php b/includes/admin.php index bda0732..62fe112 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -336,16 +336,6 @@ class Genesis_Simple_Sidebars_Admin extends Genesis_Admin_Basic { } -add_action( 'genesis_admin_menu', 'simplesidebars_settings_menu' ); -/** - * Instantiate the class to create the menu. - * - * @since 1.0.0 - */ -function simplesidebars_settings_menu() { +global $_genesis_simple_sidebars_admin; - global $_genesis_simple_sidebars_admin; - - $_genesis_simple_sidebars_admin = new Genesis_Simple_Sidebars_Admin; - -} +$_genesis_simple_sidebars_admin = new Genesis_Simple_Sidebars_Admin; diff --git a/plugin.php b/plugin.php index e06e240..b9643e5 100644 --- a/plugin.php +++ b/plugin.php @@ -75,7 +75,9 @@ function ss_genesis_init() { return; //* Include admin files - require_once( SS_PLUGIN_DIR . '/includes/admin.php' ); + if( class_exists( 'Genesis_Admin_Boxes' ) ) { + require_once( SS_PLUGIN_DIR . '/includes/admin.php' ); + } require_once( SS_PLUGIN_DIR . '/includes/inpost.php' ); require_once( SS_PLUGIN_DIR . '/includes/term.php' );