From 73fe13afd47d4e8d31ffd5f09fc602415e5f1207 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 8 Nov 2010 16:34:49 +0300
Subject: add ttrss_users.full_name; bump schema

---
 modules/popup-dialog.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/popup-dialog.php')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 61efd4c99..4c8c92b54 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -654,11 +654,13 @@
 			print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
 			print "<input type=\"hidden\" name=\"subop\" value=\"sendEmail\">"; 
 
-			$result = db_query($link, "SELECT email FROM ttrss_users WHERE
+			$result = db_query($link, "SELECT email, full_name FROM ttrss_users WHERE
 				id = " . $_SESSION["uid"]);
 
 			$user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
-			$user_name = htmlspecialchars($_SESSION["name"]);
+			$user_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
+
+			if (!$user_name) $user_name = $_SESSION['name'];
 
 			$_SESSION['email_replyto'] = $user_email;
 			$_SESSION['email_fromname'] = $user_name;
-- 
cgit v1.2.3