diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-03-02 11:36:35 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-02 11:36:35 +0100 |
| commit | dd8a3d845e274231bc53326f32685ec2431af2fa (patch) | |
| tree | 632691ae65ea47e1b1f9818622a68930c7ca6ec0 | |
| parent | 66fc1dcf3390764fa2e13be9ecea526cd8802776 (diff) | |
| download | volse-hubzilla-dd8a3d845e274231bc53326f32685ec2431af2fa.tar.gz volse-hubzilla-dd8a3d845e274231bc53326f32685ec2431af2fa.tar.bz2 volse-hubzilla-dd8a3d845e274231bc53326f32685ec2431af2fa.zip | |
reset schema value after we empty and repopulate it. second half of fix for #624
| -rw-r--r-- | Zotlabs/Module/Settings/Display.php | 2 | ||||
| -rw-r--r-- | view/js/mod_settings.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php index ee404daba..eae44e82c 100644 --- a/Zotlabs/Module/Settings/Display.php +++ b/Zotlabs/Module/Settings/Display.php @@ -65,7 +65,7 @@ class Display { set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update); $newschema = ''; - if($theme == $existing_theme){ + if($theme){ // call theme_post only if theme has not been changed if( ($themeconfigfile = $this->get_theme_config_file($theme)) != null){ require_once($themeconfigfile); diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index cf77db9bb..cb0b44ff2 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -44,7 +44,7 @@ function previewTheme(elm) { $(data.schemas).each(function(index,item) { $('<option/>',{value:item['key'],text:item['val']}).appendTo('#id_schema'); }); - $('#id_schema').val(schema ? schema : data.schemas[0]); + $('#id_schema').val(schema ? schema : '---'); $('#custom-settings-content .section-content-tools-wrapper').html(data.config); }); } |