From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 5 Apr 2013 03:53:22 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.9~65
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=bb296998de00735920ca95347576e81eba79db0b;hp=6cd2aebaa8a933edb07ba1823f712626c368a18c;p=tt-rss.git

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
---

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 730d556a..445d0aad 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -180,6 +180,8 @@ class Pref_Prefs extends Handler_Protected {
 			WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]);
 
 		initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]);
+
+		echo __("Your preferences are now set to default values.");
 	}
 
 	function index() {
diff --git a/js/prefs.js b/js/prefs.js
index b4ecd258..b1decede 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -975,13 +975,8 @@ function validatePrefsReset() {
 			new Ajax.Request("backend.php", {
 				parameters: query,
 				onComplete: function(transport) {
-					var msg = transport.responseText;
-					if (msg.match("PREFS_THEME_CHANGED")) {
-						window.location.reload();
-					} else {
-						notify_info(msg);
-						selectTab();
-					}
+					updatePrefsList();
+					notify_info(transport.responseText);
 				} });
 
 		}