Fix #280 - calendar conversion

1 files changed, 6 insertions, 6 deletions

diff --git a/library/WT/Date.php b/library/WT/Date.php
index 025792a319..5ab7d5dca9 100644
--- a/library/WT/Date.php
+++ b/library/WT/Date.php
@@ -180,20 +180,20 @@ class WT_Date {
 	/**
 	 * Convert a date to the preferred format and calendar(s) display.
 	 *
-	 * @param boolean|null $url             Wrap the date in a link to calendar.php
-	 * @param string|null  $date_format     Override the default date format
-	 * @param boolean|null $calendar_format Convert the date into other calendars
+	 * @param boolean|null $url               Wrap the date in a link to calendar.php
+	 * @param string|null  $date_format       Override the default date format
+	 * @param boolean|null $convert_calendars Convert the date into other calendars
 	 *
 	 * @return string
 	 */
-	function display($url = false, $date_format = null, $calendar_format = true) {
+	function display($url = false, $date_format = null, $convert_calendars = true) {
 		global $TEXT_DIRECTION, $DATE_FORMAT, $CALENDAR_FORMAT;
 
-		// Convert dates to given calendars and given formats
 		if ($date_format === null) {
 			$date_format = $DATE_FORMAT;
 		}
-		if ($calendar_format === null) {
+
+		if ($convert_calendars) {
 			$calendar_format = explode('_and_', $CALENDAR_FORMAT);
 		} else {
 			$calendar_format = array();