From 4fda5ccd0e248750f68b4a9802044d02f84eb7cc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 4 Mar 2021 13:40:54 +0300
Subject: fix a bunch of bookmarklets login forms not leading back

---
 plugins/bookmarklets/init.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins/bookmarklets/init.php')

diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index ab88d48e7..4bd527623 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -167,7 +167,7 @@ class Bookmarklets extends Plugin {
 		</html>
 			<?php
 		} else {
-			Handler_Public::_render_login_form();
+			Handler_Public::_render_login_form($this->host->get_public_method_url($this, "subscribe"));
 		}
 	}
 
@@ -289,10 +289,12 @@ class Bookmarklets extends Plugin {
 				}
 
 			} else {
-				print_error("Not logged in");
+				$return_to = $this->host->get_public_method_url($this, "sharepopup");
 			?>
 
-			<form action="public.php?return=<?= urlencode(Config::make_self_url()) ?>" method="post">
+			<?= format_error("Not logged in") ?>
+
+			<form action="public.php?return=<?= urlencode($return_to) ?>" method="post">
 
 				<input type="hidden" name="op" value="login">
 
-- 
cgit v1.2.3-54-g00ecf