summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2011-01-08 21:13:44 (GMT)
committer Earl Miles2011-01-08 21:13:44 (GMT)
commit495fd71a81f42b3ca70fc3a89719cbcb152c466c (patch)
tree7fabc501a380e822a3100987d7e9513b354de560
parentb6e6a3f5d7858c557a1e4bffcfb15fd798bfa029 (diff)
#967734 by das-peter and intoxination: Upgrade node_get_types() in wizard.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--plugins/page_wizards/node_override.inc11
2 files changed, 4 insertions, 8 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index edb7e7e..7bddf98 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -26,3 +26,4 @@ Fix the naked style to support content that needs to be rendered.
#978768 by linclark: Fix notice with panel fields.
#977296: Regions with _ such as with two column bricks would not save content.
#987902: Fix flexible layout splitter resize brokenness.
+#967734 by das-peter and intoxination: Upgrade node_get_types() in wizard.
diff --git a/plugins/page_wizards/node_override.inc b/plugins/page_wizards/node_override.inc
index d81d06c..41a573d 100644
--- a/plugins/page_wizards/node_override.inc
+++ b/plugins/page_wizards/node_override.inc
@@ -72,7 +72,7 @@ function panels_node_override_start($form_info, $step, &$form_state) {
* First page of our page creator wizard.
*/
function panels_node_override_basic($form, &$form_state) {
- $types = node_get_types();
+
$form_state['types'] = $types;
$already_done = array();
@@ -102,17 +102,12 @@ function panels_node_override_basic($form, &$form_state) {
);
}
- $options = array();
- foreach ($types as $name => $type) {
- if (empty($already_done[$name])) {
- $options[$name] = $type->name;
- }
- }
+
$form['type'] = array(
'#type' => 'select',
'#title' => t('Node type'),
- '#options' => $options,
+ '#options' => array_map('check_plain', node_type_get_names()),
'#default_value' => $form_state['cache']->type,
);