diff --git a/aioseop_class.php b/aioseop_class.php index 4947da62d..afb3acb38 100644 --- a/aioseop_class.php +++ b/aioseop_class.php @@ -177,7 +177,6 @@ function __construct() { 'cpostactive' => __( 'Use these checkboxes to select which Post Types you want to use All in One SEO Pack with.', 'all-in-one-seo-pack' ), 'taxactive' => __( 'Use these checkboxes to select which Taxonomies you want to use All in One SEO Pack with.', 'all-in-one-seo-pack' ), 'cposttitles' => __( 'This allows you to set the title tags for each Custom Post Type.', 'all-in-one-seo-pack' ), - 'admin_bar' => __( 'Check this to add All in One SEO Pack to the Admin Bar for easy access to your SEO settings.', 'all-in-one-seo-pack' ), 'custom_menu_order' => __( 'Check this to move the All in One SEO Pack menu item to the top of your WordPress Dashboard menu.', 'all-in-one-seo-pack' ), 'google_verify' => __( "Enter your verification code here to verify your site with Google Webmaster Tools.
Click here for documentation on this setting", 'all-in-one-seo-pack' ), 'bing_verify' => __( "Enter your verification code here to verify your site with Bing Webmaster Tools.
Click here for documentation on this setting", 'all-in-one-seo-pack' ), @@ -269,7 +268,6 @@ function __construct() { 'cpostactive' => '#seo-on-only-these-post-types', 'taxactive' => '#seo-on-only-these-taxonomies', 'cposttitles' => '#custom-titles', - 'admin_bar' => '#display-menu-in-admin-bar', 'custom_menu_order' => '#display-menu-at-the-top', 'google_verify' => '', 'bing_verify' => '', @@ -582,10 +580,6 @@ function __construct() { 'aiosp_cpostadvanced' => 'on', ), ), - 'admin_bar' => array( - 'name' => __( 'Display Menu In Admin Bar:', 'all-in-one-seo-pack' ), - 'default' => 'on', - ), 'custom_menu_order' => array( 'name' => __( 'Display Menu At The Top:', 'all-in-one-seo-pack' ), 'default' => 'on', @@ -1093,7 +1087,7 @@ function __construct() { 'display' => array( 'name' => __( 'Display Settings', 'all-in-one-seo-pack' ), 'help_link' => 'http://semperplugins.com/documentation/display-settings/', - 'options' => array( 'admin_bar', 'custom_menu_order' ), + 'options' => array( 'custom_menu_order' ), ), 'webmaster' => array( 'name' => __( 'Webmaster Verification', 'all-in-one-seo-pack' ), @@ -4473,17 +4467,8 @@ function get_metabox_header( $tabs ) { } function admin_bar_menu() { - global $wp_admin_bar, $aioseop_admin_menu, $aioseop_options, $post; - - $toggle = ''; - if ( isset( $_POST['aiosp_use_original_title'] ) && isset( $_POST['aiosp_admin_bar'] ) ) { - $toggle = 'on'; - } - if ( isset( $_POST['aiosp_use_original_title'] ) && ! isset( $_POST['aiosp_admin_bar'] ) ) { - $toggle = 'off'; - } + global $wp_admin_bar, $aioseop_admin_menu, $post; - if ( ! empty( $aioseop_options['aiosp_admin_bar'] ) && $toggle != 'off' || isset( $_POST['aiosp_admin_bar'] ) ) { $menu_slug = plugin_basename( __FILE__ ); $url = ''; @@ -4528,7 +4513,6 @@ function admin_bar_menu() { ) ); } } - } } /**