From 53c6533a4ca5e430e256d9b9d23e1d78a93c90e3 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Mon, 23 Dec 2019 16:09:39 +0000
Subject: [PATCH] Bugfix integration between watchlist and watchlist-edit

---
 module_index.json             | 2 +-
 modules/feature-watchlist.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module_index.json b/module_index.json
index d1fe0d2..c7875b3 100755
--- a/module_index.json
+++ b/module_index.json
@@ -195,7 +195,7 @@
         "version": "0.1",
         "author": "Starbeamrainbowlabs",
         "description": "Adds per-user watchlists. When a page on a user's watchlist is edited, a notification email is sent.",
-        "lastupdate": 1577116869,
+        "lastupdate": 1577117322,
         "optional": false,
         "extra_data": []
     },
diff --git a/modules/feature-watchlist.php b/modules/feature-watchlist.php
index 602e8fc..dbcf992 100644
--- a/modules/feature-watchlist.php
+++ b/modules/feature-watchlist.php
@@ -61,10 +61,10 @@ register_module([
 					if(!empty($watchlist)) {
 						$content .= "<ul class='page-list watchlist'>\n";
 						foreach($watchlist as $pagename) {
-							$content .= "<li><a href='?action=watchlist-edit&page=".rawurlencode($pagename)."&do=remove'>&#x274c;</a> <a href='?page=".rawurlencode($pagename)."'>".htmlentities($pagename)."</a></li>";
+							$content .= "<li><a href='?action=watchlist-edit&amp;page=".rawurlencode($pagename)."&amp;do=remove&amp;returnto=".rawurlencode("?action=watchlist&success=yes")."'>&#x274c;</a> <a href='?page=".rawurlencode($pagename)."'>".htmlentities($pagename)."</a></li>";
 						}
 						$content .= "</ul>";
-						$content .= "<p>You can also <a href='?action=watchlist&do=clear'>clear your entire list</a> and start again.</p>";
+						$content .= "<p>You can also <a href='?action=watchlist-edit&amp;do=clear&amp;returnto=".rawurlencode("?action=watchlist")."'>clear your entire list</a> and start again.</p>";
 					}
 					else {
 						$content .= "<p><em>You don't have any pages on your watchlist. Try visiting some pages and adding them to your watchlist and then coming back here.</em></p>";
@@ -194,6 +194,7 @@ register_module([
 				case "clear":
 					$env->user_data->watchlist = [];
 					save_settings();
+					break;
 				default:
 					http_response_code(400);
 					header("x-status: failed");