[Subtext-commits] SF.net SVN: subtext: [1714] trunk/SubtextSolution/Subtext.Web/Admin

[<ha...@us...>]

Revision: 1714
Author:   haacked
Date:     2006-08-26 00:19:23 -0700 (Sat, 26 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/subtext/?rev=1714&view=rev

Log Message:
-----------
Merged Revision 1713.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/subtext/?rev=1713&view=rev

Modified Paths:
--------------
    trunk/SubtextSolution/Subtext.Framework/Entries.cs
    trunk/SubtextSolution/Subtext.Web/Admin/Feedback.aspx.cs
Modified: trunk/SubtextSolution/Subtext.Framework/Entries.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Framework/Entries.cs	2006-08-26 07:17:50 UTC (rev 1713)
+++ trunk/SubtextSolution/Subtext.Framework/Entries.cs	2006-08-26 07:19:23 UTC (rev 1714)
@@ -570,7 +570,11 @@
 								+ "====================================================" + Environment.NewLine + Environment.NewLine
 								+ "{5}" + Environment.NewLine + Environment.NewLine
 								+ "Source: {6}#{7}";
-			                    
+
+			string sourceUrl = Config.CurrentBlog.RootUrl.ToString();
+			if (!String.IsNullOrEmpty(sourceUrl) && sourceUrl.EndsWith("/"))
+				sourceUrl = sourceUrl.Substring(0, sourceUrl.Length - 1);
+			sourceUrl += comment.SourceUrl;
 			
 			string Body = string.Format(CultureInfo.InvariantCulture, bodyFormat, 
 			                            blogTitle,
@@ -579,8 +583,8 @@
 			                            comment.AlternativeTitleUrl,
 			                            comment.SourceName,
 			                            // we're sending plain text email by default, but body includes <br />s for crlf
-			                            comment.Body.Replace("<br />", Environment.NewLine), 
-			                            Config.CurrentBlog.RootUrl + comment.SourceUrl,
+			                            comment.Body.Replace("<br />", Environment.NewLine),
+										sourceUrl,
 			                            entryId);			
 				
 			im.Send(To, From, Subject, Body);

Modified: trunk/SubtextSolution/Subtext.Web/Admin/Feedback.aspx.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Admin/Feedback.aspx.cs	2006-08-26 07:17:50 UTC (rev 1713)
+++ trunk/SubtextSolution/Subtext.Web/Admin/Feedback.aspx.cs	2006-08-26 07:19:23 UTC (rev 1714)
@@ -168,9 +168,9 @@
 				authorInfo += string.Format(@"<a href=""mailto:{0}"" title=""{0}""><img src=""{1}"" alt=""{0}"" border=""0"" class=""email"" /></a>", entry.Email, ControlHelper.ExpandTildePath("~/images/email.gif"));
 			}
 
-			if (!String.IsNullOrEmpty(entry.TitleUrl))
+			if (!String.IsNullOrEmpty(entry.AlternativeTitleUrl))
 			{
-				authorInfo += string.Format(@"<a href=""{0}"" title=""{0}""><img src=""{1}"" alt=""{0}"" border=""0"" /></a>", entry.TitleUrl, ControlHelper.ExpandTildePath("~/images/permalink.gif"));
+				authorInfo += string.Format(@"<a href=""{0}"" title=""{0}""><img src=""{1}"" alt=""{0}"" border=""0"" /></a>", entry.AlternativeTitleUrl, ControlHelper.ExpandTildePath("~/images/permalink.gif"));
 			}
 
 			return authorInfo;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.