Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

3 files changed, 4 insertions, 2 deletions

diff --git a/view/js/main.js b/view/js/main.js
index dd7b81ad4..02f2f6a3d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -25,13 +25,14 @@ var liveRecurse = 0;
 var savedTitle = '';
 var initialLoad = true;
 
-// Clear the session storage if we switch channel or log out
+// Clear the session and local storage if we switch channel or log out
 var cache_uid = '';
 if(sessionStorage.getItem('uid') !== null) {
 	cache_uid = sessionStorage.getItem('uid');
 }
 if(cache_uid !== localUser.toString()) {
 	sessionStorage.clear();
+	localStorage.clear();
 	sessionStorage.setItem('uid', localUser.toString());
 }
 
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index d6d93a863..991a4c8b1 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -626,7 +626,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 				initEditor();
 			}
 		} else {
-			autoSaveCleanup();
+			postSaveChanges('clean');
 		}
 
 		$(document).on('submit', '#profile-jot-form', function() {
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 0055fa265..d258f1992 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -145,6 +145,7 @@
 								{{if $vnotify13}}
 									{{include file="field_intcheckbox.tpl" field=$vnotify13}}
 								{{/if}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify14}}
 								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
 								{{include file="field_input.tpl" field=$evdays}}
 							</div>