Changeset 1328262

Timestamp:

01/14/2016 11:19:02 AM (10 years ago)

Author:

cip

Message:

2.2.0 compatibility with All in One SEO Pack

Location:

enhanced-category-pages/trunk

Files:

• classes/ecp/WP_GoodNeighbour.php (added)
• classes/ecp/WP_Integration.php (modified) (4 diffs)
• enhanced-category-pages.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)

enhanced-category-pages/trunk/classes/ecp/WP_Integration.php

@@ -11 +11 @@
     private $_plugin_file_path;
     private $_table_name;
+    private $_goodNeighbour;
 
     private function __construct($plugin_url, $plugin_directory_name, $plugin_file_path) {
@@ -17 +18 @@
         $this->_plugin_file_path = $plugin_file_path;
         $this->_table_name = "ecp_x_category";
+        $this->_goodNeighbour = new WP_GoodNeighbour();
     }
 
@@ -79 +81 @@
         add_action("admin_init", array(&$this, 'admin_init'), 10000);
 
-        add_filter( 'category_description', array(&$this, 'category_description_filter') );
-        add_filter( 'get_the_archive_description', array(&$this, 'category_description_filter') );
+        add_filter( 'category_description', array(&$this, 'category_description_filter'), 1 );
+        add_filter( 'get_the_archive_description', array(&$this, 'category_description_filter'), 10 );
 
         add_action("woocommerce_archive_description", array(&$this, 'on_woocommerce_archive_description'), 10000);
@@ -91 +93 @@
     public function category_description_filter($description, $categoryId = null) {
         $categoryId;
+
+        //play nice with All_in_One_SEO_Pack as we cannot use ob_start because of it
+        if ( $this->_goodNeighbour->isCallFrom_All_in_One_SEO_Pack() ) {
+            return $description;
+        }
 
         ob_start();

enhanced-category-pages/trunk/enhanced-category-pages.php

@@ -4 +4 @@
 Description: Create custom enhanced pages for categories. Manage category page as a custom post.
 Author: Ciprian Amariei, Diana Amitroaei
-Version: 2.1.3
+Version: 2.2.0
 Text Domain: enhanced-category-pages
 Text Path: languages

enhanced-category-pages/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.4
-Stable tag: 2.1.3
+Stable tag: 2.2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -168 +168 @@
 * Bug fix: correctly handle categories with apostrophes
 
+= 2.2.0 =
+* All in One SEO Pack plugin compatibility added
+
 == Upgrade Notice ==
 
@@ -199 +202 @@
 = 2.1.3 =
 * Bug fix: correctly handle categories with apostrophes
+
+= 2.2.0 =
+* All in One SEO Pack plugin compatibility added