diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 2d3d9c2..6a5426c 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-472
\ No newline at end of file
+474
\ No newline at end of file
diff --git a/Builder/IISUploadHandler/build.txt b/Builder/IISUploadHandler/build.txt
index 6e16ebf..55596b2 100644
--- a/Builder/IISUploadHandler/build.txt
+++ b/Builder/IISUploadHandler/build.txt
@@ -1 +1 @@
-208
\ No newline at end of file
+210
\ No newline at end of file
diff --git a/IISMainHandler/handlers/response/UserInfoHandler.cs b/IISMainHandler/handlers/response/UserInfoHandler.cs
index a8d0ca3..e75ce42 100644
--- a/IISMainHandler/handlers/response/UserInfoHandler.cs
+++ b/IISMainHandler/handlers/response/UserInfoHandler.cs
@@ -22,8 +22,16 @@ namespace FLocal.IISHandler.handlers.response {
override protected XElement[] getSpecificData(WebContext context) {
User user = User.LoadById(int.Parse(context.requestParts[1]));
+ Account account = null;
+ if(context.session != null) {
+ try {
+ account = Account.LoadByUser(user);
+ } catch(NotFoundInDBException) {
+ }
+ }
return new XElement[] {
user.exportToXmlForViewing(context),
+ (account == null) ? null : new XElement("accountId", account.id.ToString()), //for PM history, PM send etc
};
}
diff --git a/templates/Full/UserInfo.xslt b/templates/Full/UserInfo.xslt
index 4997641..117cfe2 100644
--- a/templates/Full/UserInfo.xslt
+++ b/templates/Full/UserInfo.xslt
@@ -186,6 +186,9 @@
|
+
+ /Conversation//
+
История