diff -r f507feede89a -r 09a1c134465b web/wp-content/plugins/all-in-one-seo-pack/aioseop.class.php --- a/web/wp-content/plugins/all-in-one-seo-pack/aioseop.class.php Wed Dec 19 12:35:13 2012 -0800 +++ b/web/wp-content/plugins/all-in-one-seo-pack/aioseop.class.php Wed Dec 19 17:46:52 2012 -0800 @@ -2,7 +2,7 @@ class All_in_One_SEO_Pack { - var $version = "1.6.15.2"; + var $version = "1.6.15.3"; /** Max numbers of chars in auto-generated description */ var $maximum_description_length = 160; @@ -121,12 +121,13 @@ if (is_single() || is_page()) { $aiosp_disable = htmlspecialchars(stripcslashes(get_post_meta($post->ID, '_aioseop_disable', true))); if ($aiosp_disable) { + $aiosp_disable_analytics = htmlspecialchars(stripcslashes( get_post_meta( $post->ID, '_aioseop_disable_analytics', true ) ) ); + if ( $aiosp_disable_analytics ) + remove_action( 'wp_head', array( $this, 'aiosp_google_analytics' ) ); return; } } - - if ($aioseop_options['aiosp_rewrite_titles']) { ob_start(array($this, 'output_callback_for_title')); } @@ -222,13 +223,14 @@ if (is_single() || is_page()) { $aiosp_disable = htmlspecialchars(stripcslashes(get_post_meta($post->ID, '_aioseop_disable', true))); if ($aiosp_disable) { - return; + $aiosp_disable_analytics = htmlspecialchars(stripcslashes( get_post_meta( $post->ID, '_aioseop_disable_analytics', true ) ) ); + if ( $aiosp_disable_analytics ) + remove_action( 'wp_head', array( $this, 'aiosp_google_analytics' ) ); + return; } } - if( $this->aioseop_mrt_exclude_this_page()==TRUE ){ - return; - } + if( $this->aioseop_mrt_exclude_this_page()==TRUE ) return; if ($aioseop_options['aiosp_rewrite_titles']) { // make the title rewrite as short as possible @@ -343,7 +345,7 @@ $page_meta = stripcslashes($aioseop_options['aiosp_page_meta_tags']); $post_meta = stripcslashes($aioseop_options['aiosp_post_meta_tags']); $home_meta = stripcslashes($aioseop_options['aiosp_home_meta_tags']); - $front_meta = stripcslashes($aioseop_options['aiosp_front_meta_tags']); + $front_meta = isset( $aioseop_options['aiosp_front_meta_tags'] ) ? '' : stripcslashes( $aioseop_options['aiosp_front_meta_tags'] ); if ( is_page() && isset( $page_meta ) && !empty( $page_meta ) && ( !$is_front_page || empty( $front_meta ) ) ) { if ( isset( $meta_string ) ) $meta_string .= "\n"; @@ -401,17 +403,18 @@ function aiosp_google_analytics(){ global $aioseop_options; - ?>