*** nodewords.install 2009-12-15 02:29:34.000000000 +-0300
--- nodewords.install 2009-12-26 18:53:00.000000000 +-0300
***************
*** 1312,1323 ****
--- 1312,1324 ----
    variable_del('nodewords_basic_use_teaser');
    variable_del('nodewords_collapse_fieldset');
    variable_del('nodewords_edit');
    variable_del('nodewords_enable_user_metatags');
    variable_del('nodewords_global');
    variable_del('nodewords_global_keywords');
+   variable_del('nodewords_global_keywords_first');
    variable_del('nodewords_head');
    variable_del('nodewords_icra_validation_content');
    variable_del('nodewords_keyword_vids');
    variable_del('nodewords_list_repeat');
    variable_del('nodewords_list_robots');
    variable_del('nodewords_max_size');


*** nodewords_basic\nodewords_basic.module 2009-12-21 00:35:32.000000000 +-0300
--- nodewords_basic\nodewords_basic.module 2009-12-26 18:58:40.000000000 +-0300
***************
*** 421,434 ****
  /**
   * Set the meta tag content.
   */
  function nodewords_basic_keywords_prepare(&$tags, $content, $options) {
!   $value = variable_get('nodewords_global_keywords', '');
! 
    if (empty($content['value'])) {
      $value .= ',' . (!empty($options['default']['keywords']['value']) ? $options['default']['keywords']['value'] : '');
    }
    else {
      $value .= ',' . $content['value'];
    }
--- 421,436 ----
  /**
   * Set the meta tag content.
   */
  function nodewords_basic_keywords_prepare(&$tags, $content, $options) {
!   $global = variable_get('nodewords_global_keywords', '');
!   $glob_first = variable_get('nodewords_global_keywords_first', 1);
!   $value = '';
!   
    if (empty($content['value'])) {
      $value .= ',' . (!empty($options['default']['keywords']['value']) ? $options['default']['keywords']['value'] : '');
    }
    else {
      $value .= ',' . $content['value'];
    }
***************
*** 451,462 ****
--- 453,471 ----
        }
      }
  
      if (count($terms)) {
        $value .= ',' . implode(',', $terms);
      }
+   }
+ 
+   if ($glob_first) {
+     $value = $global.$value;
+   }
+   else {
+     $value .= ','.$global;
    }
  
    $tags['keywords'] = nodewords_unique($value);
  }
  
  function nodewords_basic_keywords_settings_form(&$form, $form_id, $options) {
***************
*** 512,523 ****
--- 521,538 ----
        '#title' => t('Global keywords'),
        '#description' => t('Enter a comma separated list of keywords. Global keywords will be always added to each page.'),
        '#default_value' => variable_get('nodewords_global_keywords', ''),
        '#size' => 60,
        '#element_validate' => array('nodewords_basic_keywords_form_validate'),
        '#maxlength' => variable_get('nodewords_max_size', 350),
+     );
+ 
+     $form['metatags_creation']['nodewords_global_keywords_first'] = array(
+       '#type' => 'checkbox',
+       '#title' => t('Place global keywords before specific'),
+       '#default_value' => variable_get('nodewords_global_keywords_first', 1),
      );
    }
  }