Merge master

2013-10-09 12:26:10 +02:00
parent 53f2a33764 d866ffaaf5
commit 7234b2e994
30 changed files with 927 additions and 129 deletions
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -201,7 +201,14 @@
                                    <select name="{$name}" id="{$label_attr.for}" class="form-control" required>
                                        <option value="">-- {intl l="Select Country"} --</option>
                                        {loop type="country" name="country.list"}
-                                            <option value="{$ID}" {if $value == $ID}selected{/if} >{$TITLE}</option>
+                                            <option value="{$ID}"
+                                                    {if $value != ""}
+                                                        {if $value == $ID}selected{/if}
+                                                    {else}
+                                                        {if $IS_DEFAULT}selected{/if}
+                                                    {/if}
+
+                                            >{$TITLE}</option>
                                        {/loop}
                                    </select>
                                    {if $error }