From 7ff76dfcb7b14a474ca4cf4a48f3694268222d3b Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Mon, 8 Jul 2013 10:40:08 -0700
Subject: [PATCH] Fix for Private-message date

---
 e107_plugins/pm/pm_shortcodes.php | 9 +++++----
 e107_plugins/pm/pm_template.php   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 8f855cff0..3bf90272d 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -291,14 +291,15 @@ class pm_shortcodes extends e_shortcode
 
 	public function sc_pm_date($parm = '')
 	{
-		require_once(e_HANDLER.'date_handler.php');
-		if('lapse' != $parm)
+		$tp = e107::getParser();
+				
+		if($parm)
 		{
-			return convert::convert_date($this->var['pm_sent'], $parm);
+			return $tp->toDate($this->var['pm_sent'], $parm);
 		}
 		else
 		{
-			return convert::computeLapse($this->var['pm_sent']);
+			return $tp->toDate($this->var['pm_sent'], 'relative');
 		}
 	}
 
diff --git a/e107_plugins/pm/pm_template.php b/e107_plugins/pm/pm_template.php
index 0b0b7c7cc..3c2a25be5 100755
--- a/e107_plugins/pm/pm_template.php
+++ b/e107_plugins/pm/pm_template.php
@@ -159,7 +159,7 @@ $PM_OUTBOX_TABLE = "
 	<td class='forumheader3'>{PM_READ_ICON}</td>
 	<td class='forumheader3'>{PM_SUBJECT=link,outbox}{PM_ATTACHMENT_ICON}</td>
 		<td class='forumheader3'>{PM_TO=link}</td>
-	<td class='forumheader3'>{PM_DATE}</td>
+	<td class='forumheader3'>{PM_DATE=lapse}</td>
 	<td class='forumheader3' style='text-align: center'>{PM_DELETE=outbox}</td>
 </tr>
 ";