Changeset 1360868

Timestamp:

02/29/2016 03:50:59 PM (8 years ago)

Author:

dougal

Message:

Test.

File:

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

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

@@ -1379 +1379 @@
                 $field = "aiosp_$f";
 
-                if ( ( isset( $_GET['taxonomy'] ) && isset( $_GET['tag_ID'] ) ) || is_category() || is_tag() || is_tax() ) {
-                    if ( AIOSEOPPRO ) {
+                if (  ) {
+                    if (  ) {
                         if ( is_admin() && isset( $_GET['tag_ID'] ) ) {
                             $meta = get_term_meta( $_GET['tag_ID'], '_aioseop_' . $f, true );
@@ -1389 +1389 @@
                             }
                         }
+
+
+
+
+
+
                     }
-                } elseif ( is_singular() || is_admin() ) 
+                } else {
+                    $field = "aiosp_$f";
                     $meta = get_post_meta( $post_id, '_aioseop_' . $f, true );
-                if ($field === 'title') {
-                    $get_opts[$field] = htmlspecialchars( ( $meta ) );
-                } else {
-                    $get_opts[$field] = htmlspecialchars( stripslashes( $meta ) );
+                    if ( 'title' === $f || 'description' === $f ) {
+                        $get_opts[$field] = htmlspecialchars( ( $meta ) );
+                    } else {
+                        $get_opts[$field] = htmlspecialchars( stripslashes( $meta ) );
+                    }
                 }
 
@@ -1958 +1966 @@
             //$description = $this->apply_cf_fields( $description );
             if ( !(woocommerce_get_page_id( 'shop' ) == get_option( 'page_on_front' ) )  ){
-        $description = trim( stripslashes( $this->internationalize( get_post_meta( $post->ID, "_aioseop_description", true ) ) ) );
+        $description = trim( ( $this->internationalize( get_post_meta( $post->ID, "_aioseop_description", true ) ) ) );
             }
             else if ( woocommerce_get_page_id( 'shop' ) == get_option( 'page_on_front' ) && !empty( $aioseop_options['aiosp_use_static_home_info'] ) ){
             //$description = $this->get_aioseop_description( $post );
-                    $description = trim( stripslashes( $this->internationalize( get_post_meta( $post->ID, "_aioseop_description", true ) ) ) );
+                    $description = trim( ( $this->internationalize( get_post_meta( $post->ID, "_aioseop_description", true ) ) ) );
         }else if ( woocommerce_get_page_id( 'shop' ) == get_option( 'page_on_front' ) && empty( $aioseop_options['aiosp_use_static_home_info'] ) ){
             $description = $this->get_aioseop_description( $post );
@@ -2572 +2580 @@
             return '';
         }
-        $description = trim( stripslashes( $this->internationalize( get_post_meta( $post->ID, "_aioseop_description", true ) ) ) );
+        $description = trim( ( $this->internationalize( get_post_meta( $post->ID, "_aioseop_description", true ) ) ) );
         if ( !empty( $post ) && post_password_required( $post ) ) {
             return $description;
@@ -2615 +2623 @@
         $description = '';
         if ( is_front_page() && empty( $aioseop_options['aiosp_use_static_home_info'] ) )
-            $description = trim( stripslashes( $this->internationalize( $aioseop_options['aiosp_home_description'] ) ) );
+            $description = trim( ( $this->internationalize( $aioseop_options['aiosp_home_description'] ) ) );
         elseif ( !empty( $blog_page ) )
             $description = $this->get_post_description( $blog_page );
@@ -3223 +3231 @@
         }
         $text = $this->substr( $text, 0, $max );
-        return trim( stripslashes( $text ) );
+        return trim( ( $text ) );
     }
 
@@ -3230 +3238 @@
                 $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
         $text = wp_strip_all_tags( $text );
-        return trim( stripslashes( $text ) );
+        return trim( ( $text ) );
     }