From 2047801b858d56ba72da0a430903890bea0130cd Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 19 Feb 2018 20:23:13 +0100
Subject: [PATCH] updates 1201 and 1200 should return success for postgres.
 notifications: remove class show and session storage entry when we mark all
 notifications seen

---
 Zotlabs/Update/_1198.php |  2 +-
 Zotlabs/Update/_1200.php | 12 ++++++++----
 Zotlabs/Update/_1201.php | 10 +++++++---
 view/js/main.js          |  2 ++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Zotlabs/Update/_1198.php b/Zotlabs/Update/_1198.php
index 0713bb6ce..d188c94f6 100644
--- a/Zotlabs/Update/_1198.php
+++ b/Zotlabs/Update/_1198.php
@@ -21,4 +21,4 @@ function run() {
 }
 
 
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Update/_1200.php b/Zotlabs/Update/_1200.php
index 00c742593..9f7bfb152 100644
--- a/Zotlabs/Update/_1200.php
+++ b/Zotlabs/Update/_1200.php
@@ -10,11 +10,15 @@ function run() {
 			DROP INDEX item_type,
 			ADD INDEX uid_item_type (uid, item_type)
 		");
+
+		if($r)
+			return UPDATE_SUCCESS;
+		return UPDATE_FAILED;
+	}
+	else {
+		return UPDATE_SUCCESS;
 	}
 
-	if($r)
-		return UPDATE_SUCCESS;
-	return UPDATE_FAILED;
 }
 
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Update/_1201.php b/Zotlabs/Update/_1201.php
index 416d35ad6..920a7401e 100644
--- a/Zotlabs/Update/_1201.php
+++ b/Zotlabs/Update/_1201.php
@@ -13,11 +13,15 @@ class _1201 {
 				ADD INDEX uid_item_blocked (uid, item_blocked),
 				ADD INDEX item_deleted_pending_remove_changed (item_deleted, item_pending_remove, changed)
 			");
+
+			if($r)
+				return UPDATE_SUCCESS;
+			return UPDATE_FAILED;
+		}
+		else {
+			return UPDATE_SUCCESS;
 		}
 
-		if($r)
-			return UPDATE_SUCCESS;
-		return UPDATE_FAILED;
 	}
 
 }
diff --git a/view/js/main.js b/view/js/main.js
index 4a2bae802..f6fe475d8 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -357,7 +357,9 @@ function closeMenu(theID) {
 function markRead(notifType) {
 	$.get('ping?f=&markRead='+notifType);
 	$('.' + notifType + '-button').hide();
+	$('#nav-' + notifType + '-sub').removeClass('show');
 	sessionStorage.removeItem(notifType + '_notifications_cache');
+	sessionStorage.removeItem('notification_open');
 	if(timer) clearTimeout(timer);
 	timer = setTimeout(updateInit,2000);
 }