Merge remote-tracking branch 'upstream/develop' into develop

diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl
index 6f5a0655081744b890388452946afff54e79bf41..ef2091035f9cfed2a6ac8dff57d33e6ca1d8ad78 100644 (file)
--- a/view/templates/settings_display.tpl
+++ b/view/templates/settings_display.tpl
@@ -6,7 +6,12 @@
 
 {{include file="field_themeselect.tpl" field=$theme}}
 {{include file="field_input.tpl" field=$itemspage_network}}
+
+{{* Show the mobile theme selection only if mobile themes are available *}}
+{{if count($mobile_theme.4) > 1}}
 {{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{/if}}
+
 {{include file="field_input.tpl" field=$itemspage_mobile_network}}
 {{include file="field_input.tpl" field=$ajaxint}}
 {{include file="field_checkbox.tpl" field=$nowarn_insecure}}

diff --git a/view/theme/frio/templates/settings_display.tpl b/view/theme/frio/templates/settings_display.tpl
index 06709f304323ead3271a86c4288dcb6e5e809d6d..e2b84fc34bf6bd28788747ecab797e7b1e81faa6 100644 (file)
--- a/view/theme/frio/templates/settings_display.tpl
+++ b/view/theme/frio/templates/settings_display.tpl
@@ -22,7 +22,10 @@
 
                                                {{include file="field_themeselect.tpl" field=$theme}}
 
+                                               {{* Show the mobile theme selection only if mobile themes are available *}}
+                                               {{if count($mobile_theme.4) > 1}}
                                                {{include file="field_themeselect.tpl" field=$mobile_theme}}
+                                               {{/if}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
                                                        <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>