harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset schema value after we empty and repopulate it. second half of fix for #624

Browse Source
This commit is contained in:
Mario Vavti 2017-03-02 11:36:35 +01:00
parent 66fc1dcf33
commit dd8a3d845e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Settings/Display.php
View File

@ -65,7 +65,7 @@ class Display {
set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update); set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update);
$newschema = ''; $newschema = '';
if($theme == $existing_theme){ if($theme){
// call theme_post only if theme has not been changed // call theme_post only if theme has not been changed
if( ($themeconfigfile = $this->get_theme_config_file($theme)) != null){ if( ($themeconfigfile = $this->get_theme_config_file($theme)) != null){
require_once($themeconfigfile); require_once($themeconfigfile);

2
view/js/mod_settings.js
View File

@ -44,7 +44,7 @@ function previewTheme(elm) {
$(data.schemas).each(function(index,item) { $(data.schemas).each(function(index,item) {
$('<option/>',{value:item['key'],text:item['val']}).appendTo('#id_schema'); $('<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); $('#custom-settings-content .section-content-tools-wrapper').html(data.config);
}); });
} }