2 files changed, 3 insertions, 7 deletions
diff --git a/views/default/output/calendar.php b/views/default/output/calendar.php
index 8729fa1c5..fa0bd0c04 100644
--- a/views/default/output/calendar.php
+++ b/views/default/output/calendar.php
@@ -9,9 +9,5 @@
  * @uses $vars['value'] The current value, if any
  *
  */
-
-if (is_int($vars['value'])) {
-	echo date("F j, Y", $vars['value']);
-} else {
-	echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8');
-}
-\ No newline at end of file
+elgg_deprecated_notice('output/calendar was deprecated in favor of output/date', 1.8);
+echo elgg_view('output/date', $vars);
+\ No newline at end of file
diff --git a/views/default/output/date.php b/views/default/output/date.php
index bd8a65714..fda7668e7 100644
--- a/views/default/output/date.php
+++ b/views/default/output/date.php
@@ -11,5 +11,5 @@
  */
 
 if ($vars['value'] > 86400) {
-	echo date("F j, Y",$vars['value']);
+	echo date("n/d/Y", $vars['value']);
 }
 \ No newline at end of file