Merge branch 'options-fix'

jjgrainger · Mar 13, 2014 · 3c0d2ef · 3c0d2ef
2 parents 64154bd + 0c69acc
commit 3c0d2ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+##### v1.2.1
+* reduce the defaults within the class
+* replace contents of `options_merge` function with `array_replace_recursive`
+
 ##### v1.2.0
 * allow taxonomies to be sorted with the `sortable()` method
 * use of `.gitattributes` to make package lighter when deploying for production.
@@ -11,7 +15,6 @@
 * ability to use dashicons with `menu_icon()` method
 * removed old custom icon functions
 
-
 ##### v1.0.1
 * fixed issue with registering taxonomies
 * fixed issue with options merge, now accepts boolean

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# WP Custom Post Type Class v1.2.0
+# WP Custom Post Type Class v1.2.1
 
 A single class to help you build more advanced custom post types quickly.
 

diff --git a/src/CPT.php b/src/CPT.php
@@ -264,44 +264,7 @@ function set($var, $value) {
 
     function options_merge($defaults, $options) {
 
-        // set the new array as defaults
-        $new_array = $defaults;
-
-        // return the value if it is false
-        if($options === false) return false;
-
-        // foreach new option to be added
-        foreach($options as $key => $value) {
-
-            // if isset in the defaults array
-            if(isset($defaults[$key])) {
-
-                // if this option is a nested array
-                if(is_array($defaults[$key])) {
-
-                    // repeat the process
-                    $new_array[$key] = $this->options_merge($defaults[$key], $options[$key]);
-
-                // else if the value is not an array
-                } else {
-
-                    // overide with user submitted option
-                    $new_array[$key] = $options[$key];
-
-                }
-
-            // else if the default has not been set
-            } else {
-
-                // add it to the option
-                $new_array[$key] = $value;
-
-            }
-
-        }
-
-        // return the new array
-        return $new_array;
+        return array_replace_recursive($defaults, $options);
 
     }
 
@@ -503,9 +466,6 @@ function register_post_type() {
         $defaults = array(
             'labels' => $labels,
             'public' => true,
-            'hierarchical' => false,
-            'menu_position' => 5,
-            'supports' => array('title', 'editor', 'thumbnail'),
             'rewrite' => array(
                 'slug' => $slug,
                 )