Changeset 1354253

Timestamp:

02/19/2016 03:33:29 PM (8 years ago)

Author:

dougal

Message:

Bugfix: Allow nofollow, noodp, noydir options for cat/tax to work correctly with global noindex.

File:

• all-in-one-seo-pack/trunk/aioseop_class.php (modified) (2 diffs)

all-in-one-seo-pack/trunk/aioseop_class.php

@@ -1914 +1914 @@
             || ( is_tax() && in_array( get_query_var( 'taxonomy' ), $tax_noindex ) ) ) {
                 $noindex = 'noindex';
-        } elseif ( ( is_single() || is_page() || $this->is_static_posts_page() || is_attachment() || is_category() || is_tag() || is_tax() || ( $page > 1 ) ) ) {
+        } 
+        if ( ( is_single() || is_page() || $this->is_static_posts_page() || is_attachment() || is_category() || is_tag() || is_tax() || ( $page > 1 ) ) ) {
             $post_type = get_post_type();
             if ( !empty( $opts ) ) {
@@ -1927 +1928 @@
                 if ( ( $aiosp_noindex == 'on' ) || ( ( !empty( $aioseop_options['aiosp_paginated_noindex'] ) ) && ( ( $page > 1 ) ) ) ||
                      ( ( $aiosp_noindex == '' ) && ( !empty( $aioseop_options['aiosp_cpostnoindex'] ) ) && ( in_array( $post_type, $aioseop_options['aiosp_cpostnoindex'] ) ) ) )
-                    $noindex = "no" . $noindex;
+                    $noindex = "no;
                 if ( ( $aiosp_nofollow == 'on' ) || ( ( !empty( $aioseop_options['aiosp_paginated_nofollow'] ) ) && ( ( $page > 1 ) ) ) ||
                      ( ( $aiosp_nofollow == '' ) && ( !empty( $aioseop_options['aiosp_cpostnofollow'] ) ) && ( in_array( $post_type, $aioseop_options['aiosp_cpostnofollow'] ) ) ) )
-                    $nofollow = "no" . $nofollow;
+                    $nofollow = "no;
                 if ( ( $aiosp_noodp == 'on' ) || ( empty( $aiosp_noodp ) && ( !empty( $aioseop_options['aiosp_cpostnoodp'] ) && ( in_array( $post_type, $aioseop_options['aiosp_cpostnoodp'] ) ) ) ) )
                     $aiosp_noodp = true;