diff options
| -rw-r--r-- | modules/pref-prefs.php | 21 | ||||
| -rw-r--r-- | prefs.js | 9 |
2 files changed, 21 insertions, 9 deletions
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php index b789720d4..367dfe406 100644 --- a/modules/pref-prefs.php +++ b/modules/pref-prefs.php @@ -107,8 +107,6 @@ $theme_path = ""; } - $_SESSION["theme"] = $theme_path; - print "PREFS_THEME_CHANGED"; } else { print __("The configuration was saved."); @@ -146,11 +144,20 @@ $_SESSION["prefs_op_result"] = "reset-to-defaults"; + if ($_SESSION["profile"]) { + $profile_qpart = "profile = '" . $_SESSION["profile"] . "'"; + } else { + $profile_qpart = "profile IS NULL"; + } + db_query($link, "DELETE FROM ttrss_user_prefs - WHERE owner_uid = ".$_SESSION["uid"]); - initialize_user_prefs($link, $_SESSION["uid"]); + WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]); + + initialize_user_prefs($link, $_SESSION["uid"], $_SESSION["profile"]); - print __("The configuration was reset to defaults."); + print "PREFS_THEME_CHANGED"; + +// print __("The configuration was reset to defaults."); return; @@ -183,9 +190,9 @@ $_SESSION["pwd_change_result"] = ""; */ - if ($_SESSION["prefs_op_result"] == "reset-to-defaults") { +/* if ($_SESSION["prefs_op_result"] == "reset-to-defaults") { print format_notice(__("The configuration was reset to defaults.")); - } +} */ # if ($_SESSION["prefs_op_result"] == "save-config") { # print format_notice(__("The configuration was saved.")); @@ -1270,8 +1270,13 @@ function validatePrefsReset() { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - notify_info(transport.responseText); - selectTab(); + var msg = transport.responseText; + if (msg.match("PREFS_THEME_CHANGED")) { + window.location.reload(); + } else { + notify_info(msg); + selectTab(); + } } }); } |