Added the note text to the body of the email sending articles

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 626fe871704c5e6032d2116e9085f2edcd268c9b..a7efcf273ea9d62d8b8b7bdcbb2922df8153f0bc 100644 (file)
--- 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 5cf2b275055d573c342fcca4b6ece45ebb8b4f59..602a9c4a1e81d81e6f5ec6ab1a21dece30634913 100644 (file)
--- 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 -->