Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[ticket/926] Fix problem with unsubscribe-link in notifications #128

Merged
merged 1 commit into from

1 participant

This page is out of date. Refresh to see the latest.
View
4 root/includes/gallery/notification.php
@@ -340,8 +340,8 @@ static public function send_notification($mode, $handle_id, $image_name)
'U_ALBUM' => phpbb_gallery_url::create_link('full', 'album', "album_id=$album_id"),
'U_IMAGE' => phpbb_gallery_url::create_link('full', 'image_page', "album_id=$album_id&image_id=$image_id"),
'U_NEWEST_POST' => phpbb_gallery_url::create_link('full', 'viewtopic', "album_id=$album_id&image_id=$image_id"),
- 'U_STOP_WATCHING_IMAGE' => phpbb_gallery_url::create_link('full', 'image_page', "mode=unwatch&album_id=$album_id&image_id=$image_id" . generate_link_hash("unwatch_$image_id")),
- 'U_STOP_WATCHING_ALBUM' => phpbb_gallery_url::create_link('full', 'album', "mode=unwatch&album_id=$album_id" . generate_link_hash("unwatch_$album_id")),
+ 'U_STOP_WATCHING_IMAGE' => phpbb_gallery_url::create_link('full', 'image_page', "mode=unwatch&album_id=$album_id&image_id=$image_id"),
+ 'U_STOP_WATCHING_ALBUM' => phpbb_gallery_url::create_link('full', 'album', "mode=unwatch&album_id=$album_id"),
));
$messenger->send($addr['method']);
View
4 root/language/de/email/newcomment_notify.txt
@@ -6,8 +6,6 @@ du erhältst diese Benachrichtigung, weil du das Bild „{IMAGE_NAME}“ auf „
{U_IMAGE}
-Wenn du das Bild nicht länger beobachten möchtest, verwende entweder den Link „Bild nicht mehr beobachten“ beim entsprechenden Bild oder besuche folgenden Link:
-
-{U_STOP_WATCHING_IMAGE}
+Wenn du das Bild nicht länger beobachten möchtest, verwende den Link „Bild nicht mehr beobachten“ im obigen Link.
{EMAIL_SIG}
View
6 root/language/de/email/newimage_notify.txt
@@ -1,4 +1,4 @@
-Subject: Benachrichtigung über neue Bild — „{ALBUM_NAME}“
+Subject: Benachrichtigung über neues Bild — „{ALBUM_NAME}“
Hallo {USERNAME},
@@ -6,8 +6,6 @@ du erhältst diese Benachrichtigung, weil du das Album „{ALBUM_NAME}“ auf
{U_ALBUM}
-Wenn du das Album nicht länger beobachten möchtest, verwende entweder den Link „Album nicht mehr beobachten“ in dem entsprechenden Album oder besuche folgenden Link:
-
-{U_STOP_WATCHING_ALBUM}
+Wenn du das Album nicht länger beobachten möchtest, verwende den Link „Album nicht mehr beobachten“ im obigen Link.
{EMAIL_SIG}
View
6 root/language/en/email/newcomment_notify.txt
@@ -1,4 +1,4 @@
-Subject: New topic notification - "{IMAGE_NAME}"
+Subject: New comment notification - "{IMAGE_NAME}"
Hello {USERNAME},
@@ -6,8 +6,6 @@ You are receiving this notification because you are watching the image, "{IMAGE_
{U_IMAGE}
-If you no longer wish to watch this album you can either click the "Unsubscribe image" link found in the album above, or by clicking the following link:
-
-{U_STOP_WATCHING_IMAGE}
+If you no longer wish to watch this image/album you can click the "Unsubscribe image" link found in the link above.
{EMAIL_SIG}
View
6 root/language/en/email/newimage_notify.txt
@@ -1,4 +1,4 @@
-Subject: New topic notification - "{ALBUM_NAME}"
+Subject: New image notification - "{ALBUM_NAME}"
Hello {USERNAME},
@@ -6,8 +6,6 @@ You are receiving this notification because you are watching the album, "{ALBUM_
{U_ALBUM}
-If you no longer wish to watch this album you can either click the "Unsubscribe album" link found in the album above, or by clicking the following link:
-
-{U_STOP_WATCHING_ALBUM}
+If you no longer wish to watch this album you can click the "Unsubscribe album" link found in the link above.
{EMAIL_SIG}
Something went wrong with that request. Please try again.