From 3c0a112a70396afdc0c06054dc85d31ab9cec855 Mon Sep 17 00:00:00 2001 From: Vadim Parfaniuc Date: Wed, 25 Sep 2013 17:20:00 -0700 Subject: [PATCH] Fixes for issue #1482896 --- premium.module | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/premium.module b/premium.module index 5f62b6d..19367bc 100644 --- a/premium.module +++ b/premium.module @@ -151,28 +151,27 @@ function premium_form_node_type_form_alter(&$form, &$form_state) { * The Premium flag will behave like other options (published, promote, etc). */ function premium_form_alter(&$form, $form_state, $form_id) { - if (isset($form['#node']->type) && $form_id == $form['#node']->type . '_node_form' ) { + if (isset($form['type']['#value']) && $form['type']['#value'] . '_node_form' == $form_id) { if (user_access('administer node premium status')) { $node = $form['#node']; - - // existing nodes will have some preference set - if(isset($node->nid)) { - $premium_level = premium_node_level_data($node); - } else { - // get the default for this content type - $premium_level = array( 'machine_name' => variable_get("premium_{$node->type}", 0) ); - } - + + if (isset($node->nid)) { + $premium_level = premium_node_level_data($node); + }else{ + $premium_level = premium_node_level($node->type); + } + $form['options']['premium'] = array( '#type' => 'select', '#title' => t('Premium content level'), - '#default_value' => !empty($premium_level['machine_name']) ? $premium_level['machine_name'] : '', + '#default_value' => $premium_level, '#options' => array(0 => t('None')) + premium_level_option_list(), ); } } } + /** * Implements hook_ctools_plugin_api(). */ -- 1.7.12.4 (Apple Git-37)