Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 550e37c + c784576 commit 59669b79953fbfebcf9803f33887e48ccec002c5 Michael Pretty committed Sep 20, 2011
Showing with 7 additions and 7 deletions.
  1. +1 −1 child-plugins/dynamic/dynamic-content.php
  2. +6 −6 cp-custom-content/cp-custom-content-core.php
@@ -634,7 +634,7 @@ private function edit_content_type_form($content_handler, $add = true)
{
$permalink_warnings[] = __("Warning: The permalink structure must contain the %identifier% term.");
}
- if(false !== strpos($perma_structure, array('%tag%', '%category%')))
+ if ((false !== strpos($perma_structure, '%tag%')) || (false !== strpos($perma_structure, '%category%')))
{
$permalink_warnings[] = __("Warning: The user of the %tag% or %category% tags is not currently supported by cms-press.");
}
@@ -95,15 +95,15 @@ public function setup_custom_content()
$args = array(
'labels' => $handler->get_type_labels(),
- 'publicly_queryable' => (bool) $handler->get_type_publicly_queryable(),
- 'exclude_from_search' => $handler->get_type_exclude_from_search(),
- 'public' => (bool) $handler->get_type_is_public(),
- 'hierarchical'=> (bool) $handler->get_type_is_hierarchical(),
+ 'publicly_queryable' => (bool)$handler->get_type_publicly_queryable(),
+ 'exclude_from_search' => (bool)$handler->get_type_exclude_from_search(),
+ 'public' => (bool)$handler->get_type_is_public(),
+ 'hierarchical'=> (bool)$handler->get_type_is_hierarchical(),
'capability_type' => $handler->get_type_capability_type(),
- 'supports'=>$handler->get_type_supports(),
+ 'supports'=> $handler->get_type_supports(),
'rewrite' => $handler->get_type_rewrite(),
'query_var' => $handler->get_type_query_var(),
- 'show_ui' => (bool) $handler->get_type_show_ui()
+ 'show_ui' => (bool)$handler->get_type_show_ui()
);
if($edit_link = $handler->get_type_edit_link())

0 comments on commit 59669b7

Please sign in to comment.