From 2e937560dfada30b398760308ce11f08c205d468 Mon Sep 17 00:00:00 2001
From: justauser <justausr@hotmail.com>
Date: Mon, 27 May 2013 12:07:56 -0400
Subject: [PATCH] Added the note text to the body of the email sending articles
---
plugins/mail/init.php | 3 ++-
templates/email_article_template.txt | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 626fe8717..a7efcf273 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -56,7 +56,7 @@ class Mail extends Plugin {
$tpl->setVariable('USER_EMAIL', $user_email, true);
$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
- $result = db_query("SELECT link, content, title
+ $result = db_query("SELECT link, content, title, note
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
@@ -71,6 +71,7 @@ class Mail extends Plugin {
$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
+ $tpl->setVariable('ARTICLE_NOTE', strip_tags($line["note"]));
$tpl->addBlock('article');
}
diff --git a/templates/email_article_template.txt b/templates/email_article_template.txt
index 5cf2b2750..602a9c4a1 100644
--- a/templates/email_article_template.txt
+++ b/templates/email_article_template.txt
@@ -1,9 +1,13 @@
<!-- $BeginBlock email -->
Hi,
-I've been reading this and thought it might interest you:
+Thought I'd share the following with you:
+
<!-- $BeginBlock article -->
* ${ARTICLE_TITLE}
+
+ ${ARTICLE_NOTE}
+
${ARTICLE_URL}
<!-- $EndBlock article -->
--
GitLab