Index: cc_widget.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cc_widget/cc_widget.module,v
retrieving revision 1.3.2.1
diff -i -p -r1.3.2.1 cc_widget.module
*** cc_widget.module	17 Sep 2008 18:39:26 -0000	1.3.2.1
--- cc_widget.module	24 Sep 2008 21:21:27 -0000
*************** function cc_widget_admin_settings() {
*** 29,35 ****
      '#type' => 'select',
      '#title' => t('Jurisdiction'),
      '#description' => t('Select a jurisdiction for Creative Commons licensing.'),
!     '#default_value' => variable_get('cc_widget_jurisdiction', 'us'),
      '#options' => cc_widget_jurisdiction_options(),
    );
    $form['cc_widget_dimensions'] = array(
--- 29,35 ----
      '#type' => 'select',
      '#title' => t('Jurisdiction'),
      '#description' => t('Select a jurisdiction for Creative Commons licensing.'),
!     '#default_value' => variable_get('cc_widget_jurisdiction', null),
      '#options' => cc_widget_jurisdiction_options(),
    );
    $form['cc_widget_dimensions'] = array(
*************** function cc_widget_get_license_options()
*** 72,79 ****
  }
  
  function cc_widget_admin_settings_validate($form_id, $form_values, $form) {
!   $url = 'http://api.creativecommons.org/rest/1.5/simple/chooser';
!   $jurisdiction = variable_get('cc_widget_jurisdiction', 'us');
    if ($jurisdiction != 'international') {
      $url .= '?jurisdiction=' . $form_values['cc_widget_jurisdiction'];
      $regex = '/"http:\/\/creativecommons.org\/licenses\/(.*)\/(.*)\/(.*)\/"/';
--- 72,79 ----
  }
  
  function cc_widget_admin_settings_validate($form_id, $form_values, $form) {
!   $url = 'http://api.creativecommons.org/rest/1.5/simple/chooser';  
!   $jurisdiction = $form_values['cc_widget_jurisdiction'] ? $form_values['cc_widget_jurisdiction'] : variable_get('cc_widget_jurisdiction', 'us');
    if ($jurisdiction != 'international') {
      $url .= '?jurisdiction=' . $form_values['cc_widget_jurisdiction'];
      $regex = '/"http:\/\/creativecommons.org\/licenses\/(.*)\/(.*)\/(.*)\/"/';
*************** function cc_widget_admin_settings_valida
*** 83,89 ****
    }
    $result = drupal_http_request($url);
    preg_match($regex, $result->data, $matches);
-   
    drupal_set_message(t('Setting license version %version, latest for selected jurisdiction %jurisdiction.', array('%version' => $matches[2], '%jurisdiction' => $form_values['cc_widget_jurisdiction'])));
    form_set_value($form['cc_widget_version'], $matches[2]);
  }
--- 83,88 ----