From 6d67359ce5d93dfb4ddaa16a17a847e3bab59f21 Mon Sep 17 00:00:00 2001
From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Thu, 16 Sep 2010 11:22:32 +0000
Subject: [PATCH] Fixed a critical bug with posts preview

---
 Builder/IISMainHandler/build.txt              |  2 +-
 .../response/AbstractNewMessageHandler.cs     |  2 +-
 templates/Full/NewThread.xslt                 |  4 +++-
 templates/Full/PostReply.xslt                 | 21 +++++++++++--------
 templates/Full/elems/TextEditor.xslt          |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 3b6be60..b5089da 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-1319
\ No newline at end of file
+1323
\ No newline at end of file
diff --git a/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs b/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs
index 9d11302..2a4d5b2 100644
--- a/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs
+++ b/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs
@@ -14,7 +14,7 @@ namespace FLocal.IISHandler.handlers.response {
 		protected override IEnumerable<XElement> getSpecificData(WebContext context) {
 			var result = new List<XElement>();
 			if(context.httprequest.Form.AllKeys.Contains("title")) {
-				result.Add(new XElement("title", context.httprequest.Form["title"]));
+				result.Add(new XElement("newTitle", context.httprequest.Form["title"]));
 			}
 			if(context.httprequest.Form.AllKeys.Contains("Body")) {
 				result.Add(new XElement("bodyUBB", context.httprequest.Form["Body"]));
diff --git a/templates/Full/NewThread.xslt b/templates/Full/NewThread.xslt
index 8150ad7..d2a5e16 100644
--- a/templates/Full/NewThread.xslt
+++ b/templates/Full/NewThread.xslt
@@ -36,7 +36,9 @@
 									<br/>
 									<xsl:text>Тема: </xsl:text>
 									<br/>
-									<input type="text" tabindex="1" name="title" maxlength="70" class="formboxes" size="60"/>
+									<input type="text" tabindex="1" name="title" maxlength="70" class="formboxes" size="60">
+										<xsl:attribute name="value"><xsl:value-of select="newTitle"/></xsl:attribute>
+									</input>
 									<span class="small">Слой сообщения:</span> 
 									<select class="formboxes" name="layerId">
 										<xsl:apply-templates select="layers">
diff --git a/templates/Full/PostReply.xslt b/templates/Full/PostReply.xslt
index 8d0617a..293d10e 100644
--- a/templates/Full/PostReply.xslt
+++ b/templates/Full/PostReply.xslt
@@ -37,17 +37,20 @@
 									<xsl:text>Тема: </xsl:text>
 									<br/>
 									<input type="text" tabindex="1" name="title" maxlength="70" class="formboxes" size="60">
-										<xsl:choose>
-											<xsl:when test="substring(post/title, 1, 4)='Re: '">
-												<xsl:attribute name="value"><xsl:value-of select="post/title"/></xsl:attribute>
-											</xsl:when>
-											<xsl:otherwise>
-												<xsl:attribute name="value">
+										<xsl:attribute name="value">
+											<xsl:choose>
+												<xsl:when test="newTitle and (newTitle != '')">
+													<xsl:value-of select="newTitle"/>
+												</xsl:when>
+												<xsl:when test="substring(post/title, 1, 4)='Re: '">
+													<xsl:value-of select="post/title"/>
+												</xsl:when>
+												<xsl:otherwise>
 													<xsl:text>Re: </xsl:text>
 													<xsl:value-of select="post/title"/>
-												</xsl:attribute>
-											</xsl:otherwise>
-										</xsl:choose>
+												</xsl:otherwise>
+											</xsl:choose>
+										</xsl:attribute>
 									</input>
 									<span class="small">Слой сообщения:</span> 
 									<select class="formboxes" name="layerId">
diff --git a/templates/Full/elems/TextEditor.xslt b/templates/Full/elems/TextEditor.xslt
index c53b3f4..30183c3 100644
--- a/templates/Full/elems/TextEditor.xslt
+++ b/templates/Full/elems/TextEditor.xslt
@@ -276,7 +276,7 @@ function insertInBody(str) {
 											<xsl:attribute name="src">/static/images/message-normal-read.gif</xsl:attribute>
 										</img>
 									</a>
-									<b class="separate"><xsl:value-of select="title"/></b>
+									<b class="separate"><xsl:value-of select="newTitle"/></b>
 									<br />
 									<font class="small" style="padding-left:2em"><xsl:apply-templates select="postDate/date" mode="dateTime"/></font>
 								</td>