Skip to content
This repository
Browse code

Merge branch 'develop'

  • Loading branch information...
commit 59669b79953fbfebcf9803f33887e48ccec002c5 2 parents 550e37c + c784576
Michael Pretty prettyboymp authored
2  child-plugins/dynamic/dynamic-content.php
@@ -634,7 +634,7 @@ private function edit_content_type_form($content_handler, $add = true)
634 634 {
635 635 $permalink_warnings[] = __("Warning: The permalink structure must contain the %identifier% term.");
636 636 }
637   - if(false !== strpos($perma_structure, array('%tag%', '%category%')))
  637 + if ((false !== strpos($perma_structure, '%tag%')) || (false !== strpos($perma_structure, '%category%')))
638 638 {
639 639 $permalink_warnings[] = __("Warning: The user of the %tag% or %category% tags is not currently supported by cms-press.");
640 640 }
12 cp-custom-content/cp-custom-content-core.php
@@ -95,15 +95,15 @@ public function setup_custom_content()
95 95
96 96 $args = array(
97 97 'labels' => $handler->get_type_labels(),
98   - 'publicly_queryable' => (bool) $handler->get_type_publicly_queryable(),
99   - 'exclude_from_search' => $handler->get_type_exclude_from_search(),
100   - 'public' => (bool) $handler->get_type_is_public(),
101   - 'hierarchical'=> (bool) $handler->get_type_is_hierarchical(),
  98 + 'publicly_queryable' => (bool)$handler->get_type_publicly_queryable(),
  99 + 'exclude_from_search' => (bool)$handler->get_type_exclude_from_search(),
  100 + 'public' => (bool)$handler->get_type_is_public(),
  101 + 'hierarchical'=> (bool)$handler->get_type_is_hierarchical(),
102 102 'capability_type' => $handler->get_type_capability_type(),
103   - 'supports'=>$handler->get_type_supports(),
  103 + 'supports'=> $handler->get_type_supports(),
104 104 'rewrite' => $handler->get_type_rewrite(),
105 105 'query_var' => $handler->get_type_query_var(),
106   - 'show_ui' => (bool) $handler->get_type_show_ui()
  106 + 'show_ui' => (bool)$handler->get_type_show_ui()
107 107 );
108 108
109 109 if($edit_link = $handler->get_type_edit_link())

0 comments on commit 59669b7

Please sign in to comment.
Something went wrong with that request. Please try again.