diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 1fb6394..90afd51 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-936
\ No newline at end of file
+940
\ No newline at end of file
diff --git a/Common/dataobjects/Board.cs b/Common/dataobjects/Board.cs
index b8fb7bc..5e5f866 100644
--- a/Common/dataobjects/Board.cs
+++ b/Common/dataobjects/Board.cs
@@ -188,7 +188,7 @@ namespace FLocal.Common.dataobjects {
if(!this.lastPostId.HasValue) {
return new XElement("none");
} else {
- return this.lastPost.exportToXmlWithoutThread(context, false);
+ return this.lastPost.exportToXml(context, false);
}
}
diff --git a/Common/dataobjects/Post.cs b/Common/dataobjects/Post.cs
index bb4c07d..454916f 100644
--- a/Common/dataobjects/Post.cs
+++ b/Common/dataobjects/Post.cs
@@ -179,7 +179,7 @@ namespace FLocal.Common.dataobjects {
return XElement.Parse("" + context.outputParams.preprocessBodyIntermediate(this.body) + "", LoadOptions.PreserveWhitespace);
}
- public XElement exportToXmlWithoutThread(UserContext context, bool includeParentPost, params XElement[] additional) {
+ public XElement exportToXml(UserContext context, bool includeParentPost, params XElement[] additional) {
if(!context.isPostVisible(this)) return null;
@@ -200,7 +200,7 @@ namespace FLocal.Common.dataobjects {
);
if(includeParentPost) {
if(this.parentPostId.HasValue) {
- result.Add(new XElement("parentPost", this.parentPost.exportToXmlWithoutThread(context, false)));
+ result.Add(new XElement("parentPost", this.parentPost.exportToXml(context, false)));
}
}
if(additional.Length > 0) {
diff --git a/Common/dataobjects/Thread.cs b/Common/dataobjects/Thread.cs
index 4ece318..ac157ff 100644
--- a/Common/dataobjects/Thread.cs
+++ b/Common/dataobjects/Thread.cs
@@ -183,7 +183,7 @@ namespace FLocal.Common.dataobjects {
);
}
- public XElement exportToXml(UserContext context, bool includeFirstPost, params XElement[] additional) {
+ public XElement exportToXml(UserContext context, params XElement[] additional) {
if(!context.isPostVisible(this.firstPost)) return null;
@@ -203,9 +203,6 @@ namespace FLocal.Common.dataobjects {
new XElement("layerName", this.firstPost.layer.name),
context.formatTotalPosts(this.totalPosts)
);
- if(includeFirstPost) {
- result.Add(new XElement("firstPost", this.firstPost.exportToXmlWithoutThread(context, false)));
- }
if(context.account != null) {
int lastReadId = this.getLastReadId(context.account);
result.Add(
diff --git a/IISMainHandler/handlers/BoardHandler.cs b/IISMainHandler/handlers/BoardHandler.cs
index 668e1c7..2f8535a 100644
--- a/IISMainHandler/handlers/BoardHandler.cs
+++ b/IISMainHandler/handlers/BoardHandler.cs
@@ -27,7 +27,7 @@ namespace FLocal.IISHandler.handlers {
new XElement("currentLocation", board.exportToXmlSimpleWithParent(context)),
new XElement("boards", from subBoard in board.subBoards select subBoard.exportToXml(context, true)),
new XElement("threads",
- from thread in threads select thread.exportToXml(context, false),
+ from thread in threads select thread.exportToXml(context),
pageOuter.exportToXml(1, 5, 1)
)
};
diff --git a/IISMainHandler/handlers/PostHandler.cs b/IISMainHandler/handlers/PostHandler.cs
index d639576..20a4716 100644
--- a/IISMainHandler/handlers/PostHandler.cs
+++ b/IISMainHandler/handlers/PostHandler.cs
@@ -28,8 +28,8 @@ namespace FLocal.IISHandler.handlers {
XElement[] result = new XElement[] {
new XElement("currentLocation", post.exportToXmlSimpleWithParent(context)),
- post.thread.exportToXml(context, false),
- new XElement("posts", post.exportToXmlWithoutThread(context, true, new XElement("isUnread", (post.id > lastReadId).ToPlainString())))
+ post.thread.exportToXml(context),
+ new XElement("posts", post.exportToXml(context, true, new XElement("isUnread", (post.id > lastReadId).ToPlainString())))
};
post.thread.incrementViewsCounter();
diff --git a/IISMainHandler/handlers/ThreadHandler.cs b/IISMainHandler/handlers/ThreadHandler.cs
index bd624c7..0fea333 100644
--- a/IISMainHandler/handlers/ThreadHandler.cs
+++ b/IISMainHandler/handlers/ThreadHandler.cs
@@ -57,9 +57,9 @@ namespace FLocal.IISHandler.handlers {
XElement[] result = new XElement[] {
new XElement("currentLocation", thread.exportToXmlSimpleWithParent(context)),
- thread.exportToXml(context, false),
+ thread.exportToXml(context),
new XElement("posts",
- from post in posts select post.exportToXmlWithoutThread(context, true, new XElement("isUnread", (post.id > lastReadId).ToPlainString())),
+ from post in posts select post.exportToXml(context, true, new XElement("isUnread", (post.id > lastReadId).ToPlainString())),
pageOuter.exportToXml(2, 5, 2)
)
};
diff --git a/IISMainHandler/handlers/request/CreateThreadHandler.cs b/IISMainHandler/handlers/request/CreateThreadHandler.cs
index 004e610..db5af35 100644
--- a/IISMainHandler/handlers/request/CreateThreadHandler.cs
+++ b/IISMainHandler/handlers/request/CreateThreadHandler.cs
@@ -25,7 +25,7 @@ namespace FLocal.IISHandler.handlers.request {
return new XElement[] {
newThread.board.exportToXml(context, false),
- newPost.exportToXmlWithoutThread(context, false)
+ newPost.exportToXml(context, false)
};
}
}
diff --git a/IISMainHandler/handlers/request/EditHandler.cs b/IISMainHandler/handlers/request/EditHandler.cs
index ad5e13d..4866b4f 100644
--- a/IISMainHandler/handlers/request/EditHandler.cs
+++ b/IISMainHandler/handlers/request/EditHandler.cs
@@ -17,7 +17,7 @@ namespace FLocal.IISHandler.handlers.request {
protected override XElement[] Do(WebContext context) {
Post post = Post.LoadById(int.Parse(context.httprequest.Form["postId"]));
- XElement postXml = post.exportToXmlWithoutThread(context, false);
+ XElement postXml = post.exportToXml(context, false);
post.Edit(
context.session.account.user,
this.getTitle(context),
diff --git a/IISMainHandler/handlers/request/ReplyHandler.cs b/IISMainHandler/handlers/request/ReplyHandler.cs
index 70c301f..f728919 100644
--- a/IISMainHandler/handlers/request/ReplyHandler.cs
+++ b/IISMainHandler/handlers/request/ReplyHandler.cs
@@ -25,7 +25,7 @@ namespace FLocal.IISHandler.handlers.request {
return new XElement[] {
newPost.thread.board.exportToXml(context, false),
- newPost.exportToXmlWithoutThread(context, false)
+ newPost.exportToXml(context, false)
};
}
diff --git a/IISMainHandler/handlers/response/AllPostsHandler.cs b/IISMainHandler/handlers/response/AllPostsHandler.cs
index eb1b321..d62f714 100644
--- a/IISMainHandler/handlers/response/AllPostsHandler.cs
+++ b/IISMainHandler/handlers/response/AllPostsHandler.cs
@@ -49,7 +49,7 @@ namespace FLocal.IISHandler.handlers.response {
XElement[] result = new XElement[] {
new XElement("posts",
- from post in posts select post.exportToXmlWithoutThread(context, true),
+ from post in posts select post.exportToXml(context, true),
pageOuter.exportToXml(2, 5, 2)
)
};
diff --git a/IISMainHandler/handlers/response/BoardAsThread.cs b/IISMainHandler/handlers/response/BoardAsThread.cs
index e9e45ff..5ef9b61 100644
--- a/IISMainHandler/handlers/response/BoardAsThread.cs
+++ b/IISMainHandler/handlers/response/BoardAsThread.cs
@@ -33,8 +33,8 @@ namespace FLocal.IISHandler.handlers.response {
return new XElement[] {
new XElement("currentLocation", board.exportToXmlSimpleWithParent(context)),
new XElement("boards", from subBoard in board.subBoards select subBoard.exportToXml(context, true)),
- new XElement("threads",
- from thread in threads select thread.exportToXml(context, true),
+ new XElement("posts",
+ from thread in threads select thread.firstPost.exportToXml(context, true),
pageOuter.exportToXml(1, 5, 1)
)
};
diff --git a/IISMainHandler/handlers/response/EditHandler.cs b/IISMainHandler/handlers/response/EditHandler.cs
index 4ed7b0b..fa9fcb4 100644
--- a/IISMainHandler/handlers/response/EditHandler.cs
+++ b/IISMainHandler/handlers/response/EditHandler.cs
@@ -23,8 +23,8 @@ namespace FLocal.IISHandler.handlers.response {
return new XElement[] {
post.thread.board.exportToXml(context, false),
- post.thread.exportToXml(context, false),
- post.exportToXmlWithoutThread(context, false),
+ post.thread.exportToXml(context),
+ post.exportToXml(context, false),
post.latestRevision.exportToXml(context),
new XElement("layers",
from layer in PostLayer.allLayers select layer.exportToXml(context)
diff --git a/IISMainHandler/handlers/response/PMReplyToPostHandler.cs b/IISMainHandler/handlers/response/PMReplyToPostHandler.cs
index 351454c..663b17c 100644
--- a/IISMainHandler/handlers/response/PMReplyToPostHandler.cs
+++ b/IISMainHandler/handlers/response/PMReplyToPostHandler.cs
@@ -32,8 +32,8 @@ namespace FLocal.IISHandler.handlers.response {
return new XElement[] {
post.thread.board.exportToXml(context, false),
- post.thread.exportToXml(context, false),
- post.exportToXmlWithoutThread(context, false),
+ post.thread.exportToXml(context),
+ post.exportToXml(context, false),
new XElement("receiver", Account.LoadByUser(post.poster).exportToXml(context)),
new XElement("quoted", quoted),
};
diff --git a/IISMainHandler/handlers/response/ReplyHandler.cs b/IISMainHandler/handlers/response/ReplyHandler.cs
index f617f1f..807d36a 100644
--- a/IISMainHandler/handlers/response/ReplyHandler.cs
+++ b/IISMainHandler/handlers/response/ReplyHandler.cs
@@ -32,8 +32,8 @@ namespace FLocal.IISHandler.handlers.response {
return new XElement[] {
post.thread.board.exportToXml(context, false),
- post.thread.exportToXml(context, false),
- post.exportToXmlWithoutThread(context, false),
+ post.thread.exportToXml(context),
+ post.exportToXml(context, false),
new XElement("layers",
from layer in PostLayer.allLayers select layer.exportToXml(context)
),
diff --git a/IISMainHandler/handlers/response/UserPostsHandler.cs b/IISMainHandler/handlers/response/UserPostsHandler.cs
index be48c42..b09b217 100644
--- a/IISMainHandler/handlers/response/UserPostsHandler.cs
+++ b/IISMainHandler/handlers/response/UserPostsHandler.cs
@@ -32,7 +32,7 @@ namespace FLocal.IISHandler.handlers.response {
XElement[] result = new XElement[] {
user.exportToXmlForViewing(context),
new XElement("posts",
- from post in posts select post.exportToXmlWithoutThread(context, true),
+ from post in posts select post.exportToXml(context, true),
pageOuter.exportToXml(2, 5, 2)
)
};
diff --git a/IISMainHandler/handlers/response/UserRepliesHandler.cs b/IISMainHandler/handlers/response/UserRepliesHandler.cs
index da97acd..3ef267a 100644
--- a/IISMainHandler/handlers/response/UserRepliesHandler.cs
+++ b/IISMainHandler/handlers/response/UserRepliesHandler.cs
@@ -32,7 +32,7 @@ namespace FLocal.IISHandler.handlers.response {
XElement[] result = new XElement[] {
user.exportToXmlForViewing(context),
new XElement("posts",
- from post in posts select post.exportToXmlWithoutThread(context, true),
+ from post in posts select post.exportToXml(context, true),
pageOuter.exportToXml(2, 5, 2)
)
};
diff --git a/templates/Full/BoardAsThread.xslt b/templates/Full/BoardAsThread.xslt
index 28b404a..0f8548a 100644
--- a/templates/Full/BoardAsThread.xslt
+++ b/templates/Full/BoardAsThread.xslt
@@ -99,20 +99,20 @@
|
страницы:
-
+
/BoardAsThread//
|
-
+
-
+