From 3d290d7f6174fcf498abd4a0c6d8bb7cb72a7498 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Tue, 10 Apr 2012 18:26:25 +0100
Subject: [PATCH] std and selected @a0f2282ebce9776f9805ca3f53e4baba2f8ffd50

---
 admin/woocommerce-admin-settings-forms.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/woocommerce-admin-settings-forms.php b/admin/woocommerce-admin-settings-forms.php
index d9117ef8f2d..667dde5e1be 100644
--- a/admin/woocommerce-admin-settings-forms.php
+++ b/admin/woocommerce-admin-settings-forms.php
@@ -247,9 +247,13 @@ function woocommerce_admin_fields($options) {
                     <td class="forminp"><select name="<?php echo esc_attr( $value['id'] ); ?>" id="<?php echo esc_attr( $value['id'] ); ?>" style="<?php echo esc_attr( $value['css'] ); ?>" class="<?php if (isset($value['class'])) echo $value['class']; ?>">
                         <?php
                         foreach ($value['options'] as $key => $val) {
-                        ?>
-                            <option value="<?php echo esc_attr( $key ); ?>" <?php if (get_option($value['id']) == $key) { ?> selected="selected" <?php } ?>><?php echo $val ?></option>
-                        <?php
+                        	$_current = get_option( $value['id'] );
+							if ( ! $_current ) {
+								$_current = $value['std'];
+							}
+                        	?>
+                        	<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $_current, $key ); ?>><?php echo $val ?></option>
+                        	<?php
                         }
                         ?>
                        </select> <?php echo $description; ?>