Merge branch 'refs/heads/v1.2.2-rc1'

Author: jjgrainger

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+##### v1.2.2
+* fix issues when registering taxonomy across multiple post type
+* remove wrapper function `options_merge`
+
 ##### v1.2.1
 * reduce the defaults within the class
 * replace contents of `options_merge` function with `array_replace_recursive`

README.md

@@ -1,4 +1,4 @@
-# WP Custom Post Type Class v1.2.1
+# WP Custom Post Type Class v1.2.2
 
 A single class to help you build more advanced custom post types quickly.
 

src/CPT.php

@@ -8,6 +8,8 @@
 
     @author     jjgrainger
     @url        http://jjgrainger.co.uk
+    @version    1.2.1
+    @license    http://www.opensource.org/licenses/mit-license.html  MIT License
 
 */
 
@@ -75,6 +77,16 @@ class CPT {
     public $taxonomies;
 
 
+    /*
+        @var  array  $taxonomy_settings
+        public variable that holds an array of the taxonomies associated with the post type and their options
+        used when registering the taxonomies
+        assigined on register_taxonomy()
+    */
+
+    public $taxonomy_settings;
+
+
 
     /*
         @var  array  $filters
@@ -117,7 +129,7 @@ class CPT {
     /*
         @function __contructor(@post_type_name, @options)
 
-        @param  mixed   $post_type_names    The name(s) of the post type, accepts (post type name, slug, plural, singlualr)
+        @param  mixed   $post_type_names    The name(s) of the post type, accepts (post type name, slug, plural, singluar)
         @param  array   $options            User submitted options
     */
 
@@ -181,11 +193,18 @@ function __construct($post_type_names, $options = array()) {
         // register the post type
         $this->add_action('init', array(&$this, 'register_post_type'));
 
+        // register taxonomies
+        $this->add_action('init', array(&$this, 'register_taxonomies'));
+
         // add taxonomy to admin edit columns
         $this->add_filter('manage_edit-' . $this->post_type_name . '_columns', array(&$this, 'add_admin_columns'));
 
         // populate the taxonomy columns with the posts terms
         $this->add_action('manage_' . $this->post_type_name . '_posts_custom_column', array(&$this, 'populate_admin_columns'), 10, 2);
+
+        // add filter select option to admin edit
+        $this->add_action('restrict_manage_posts', array(&$this, 'add_taxonomy_filters'));
+
     }
 
 
@@ -252,23 +271,6 @@ function set($var, $value) {
     }
 
 
-    /*
-        helper function options_merge
-        merges user submitted options array with default settings
-        preserving default data if not included in user options
-
-        @param  array  $defaults        the default option array
-        @param  array  $options         user submitted options to add/override defaults
-
-    */
-
-    function options_merge($defaults, $options) {
-
-        return array_replace_recursive($defaults, $options);
-
-    }
-
-
 
     /*
         helper function add_action
@@ -472,7 +474,7 @@ function register_post_type() {
             );
 
         // merge user submitted options with defaults
-        $options = $this->options_merge($defaults, $this->options);
+        $options = array_replace_recursive($defaults, $this->options);
 
         // set the object options as full options passed
         $this->options = $options;
@@ -582,38 +584,45 @@ function register_taxonomy($taxonomy_names, $options = array()) {
         );
 
         // merge default options with user submitted options
-        $options = $this->options_merge($defaults, $options);
+        $options = array_replace_recursive($defaults, $options);
 
-        // register the taxonomy if it doesn't exist
-        if(!taxonomy_exists($taxonomy_name)) {
+        // add the taxonomy to the object array
+        // this is used to add columns and filters to admin pannel
+        $this->taxonomies[] = $taxonomy_name;
 
-            // register the taxonomy with Wordpress
-            $this->add_action('init', function() use($taxonomy_name, $post_type, $options) {
-                register_taxonomy($taxonomy_name, $post_type, $options);
-            });
+        // create array used when registering taxonomies
+        $this->taxonomy_settings[$taxonomy_name] = $options;
 
+    }
 
-        } else {
 
-            // if taxonomy exists, attach exisiting taxonomy to post type
-            $this->add_action('init', function() use($taxonomy_name, $post_type) {
-                register_taxonomy_for_object_type($taxonomy_name, $post_type);
-            });
 
-        }
+    /*
+        function register_taxonomies
+        cycles through taxonomies added with the class and registers them
 
-        // add the taxonomy to the object array
-        // this is used to add columns and filters to admin pannel
-        $this->taxonomies[] = $taxonomy_name;
+        function is used with add_action
+    */
+    function register_taxonomies() {
 
-        // add taxonomy to admin edit columns
-        $this->add_filter('manage_edit-' . $post_type . '_columns', array(&$this, 'add_admin_columns'));
+        // foreach taxonomy registered with the post type
+        foreach($this->taxonomy_settings as $taxonomy_name => $options) {
 
-        // populate the taxonomy columns with the posts terms
-        $this->add_action('manage_' . $post_type . '_posts_custom_column', array(&$this, 'populate_admin_columns'), 10, 2);
+            // register the taxonomy if it doesn't exist
+            if(!taxonomy_exists($taxonomy_name)) {
+
+                // register the taxonomy with Wordpress
+                register_taxonomy($taxonomy_name, $this->post_type_name, $options);
+
+
+            } else {
+
+                // if taxonomy exists, attach exisiting taxonomy to post type
+                register_taxonomy_for_object_type($taxonomy_name, $this->post_type_name);
+
+            }
+        }
 
-        // add filter select option to admin edit
-        $this->add_action('restrict_manage_posts', array(&$this, 'add_taxonomy_filters'));
 
     }
 
@@ -1099,4 +1108,4 @@ function menu_icon($icon = "dashicons-admin-page") {
 
     }
 
-}
+}