Add text-only support in html email handler

Facyla · Dec 12, 2016 · 53b3e9a · 53b3e9a
1 parent a771a2a
commit 53b3e9a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/mod/esope/lib/esope/html_email_handler.php b/mod/esope/lib/esope/html_email_handler.php
@@ -18,7 +18,9 @@
  * - systematically strip HTML tags from text-only version.
  * 
  * CHANGES :
- * 1. Systematically strip tags from text version => in 
+ * 1. Always add a text version
+ * 2. Systematically strip tags from text version
+ * 3. Add user settings for prefered version(s) ?
  */
 
 

diff --git a/mod/esope/views/default/newsletter/view/body.php b/mod/esope/views/default/newsletter/view/body.php
@@ -65,9 +65,19 @@
 		$email = get_input('e');
 		if ($email) {
 			$replacements['{newsletter_url}'] = $replacements['{newsletter_url}'] . '?e=' . $email;
-			$replacements['{unsublink}'] = newsletter_generate_unsubscribe_link($entity->getContainerEntity(), $email);
+			// ESOPE: avoid warning if container entity not accessible
+			if (elgg_instanceof($container_entity)) {
+				$replacements['{unsublink}'] = newsletter_generate_unsubscribe_link($container_entity, $email);
+			} else {
+				$replacements['{unsublink}'] = false;
+			}
 		} else {
-			$replacements['{unsublink}'] = newsletter_generate_unsubscribe_link($entity->getContainerEntity(), '');
+			// ESOPE: avoid warning if container entity not accessible
+			if (elgg_instanceof($container_entity)) {
+				$replacements['{unsublink}'] = newsletter_generate_unsubscribe_link($container_entity, '');
+			} else {
+				$replacements['{unsublink}'] = false;
+			}
 		}
 	}
 }