Index: uc_multiprice.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/uc_multiprice/uc_multiprice.module,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 uc_multiprice.module --- uc_multiprice.module 31 Aug 2009 12:10:02 -0000 1.1.2.4 +++ uc_multiprice.module 17 Jul 2010 07:31:51 -0000 @@ -82,25 +82,29 @@ function uc_multiprice_form_alter(&$form $form['base']['multiprice']['countries'] += uc_multiprice_field_element($country); $exist[] = $country->country_id; } - + + $countries = array(); $result = db_query("SELECT country_id, country_name FROM {uc_countries} WHERE version > 0 ORDER BY country_name ASC"); while ($country = db_fetch_object($result)) { if (!in_array($country->country_id, $exist)) $countries[$country->country_id] = $country->country_name; } - - $form['base']['multiprice']['more'] = array( - '#type' => 'select', - '#description' => t("Select the country/region to add a price overide."), - '#options' => $countries, - '#weight' => 1, - '#ahah' => array( - 'path' => 'uc_multiprice/js', - 'wrapper' => 'multiprice-countries', - 'method' => 'replace', - 'effect' => 'slide', - ), - ); + + if (count($countries)) { + $form['base']['multiprice']['more'] = array( + '#type' => 'select', + '#description' => t("Select the country/region to add a price overide."), + '#options' => $countries, + '#weight' => 1, + '#ahah' => array( + 'path' => 'uc_multiprice/js', + 'wrapper' => 'multiprice-countries', + 'method' => 'replace', + 'effect' => 'slide', + ), + ); + } + $form['#validate'][] = 'uc_multiprice_form_validate'; }