#663955. Be explicit about which sorts of URL to generate: '&' for ones in html, and '&' for ones in HTTP headers and between WT_JS_START/WT_JS_END markers. Get rid of "encode_url()" function, which attempted to "magically" fix problems with the wrong URL style.

1 files changed, 6 insertions, 5 deletions

diff --git a/includes/classes/class_date.php b/includes/classes/class_date.php
index e0f95ca430..6119b8d3e7 100644
--- a/includes/classes/class_date.php
+++ b/includes/classes/class_date.php
@@ -604,30 +604,31 @@ class CalendarDate {
 	// Create a URL that links this date to the WT calendar
 	function CalendarURL($date_fmt="") {
 		global $DATE_FORMAT;
-		if (empty($date_fmt))
+		if (empty($date_fmt)) {
 			$date_fmt=$DATE_FORMAT;
+		}
 		$URL='calendar.php?cal='.$this->CALENDAR_ESCAPE();
 		$action="year";
 		if (strpos($date_fmt, "Y")!==false
 		||  strpos($date_fmt, "y")!==false) {
-			$URL.='&year='.$this->FormatGedcomYear();
+			$URL.='&year='.$this->FormatGedcomYear();
 		}
 		if (strpos($date_fmt, "F")!==false
 		||  strpos($date_fmt, "M")!==false
 		||  strpos($date_fmt, "m")!==false
 		||  strpos($date_fmt, "n")!==false) {
-			$URL.='&month='.$this->FormatGedcomMonth();
+			$URL.='&month='.$this->FormatGedcomMonth();
 			if ($this->m>0)
 				$action="calendar";
 		}
 		if (strpos($date_fmt, "d")!==false
 		||  strpos($date_fmt, "D")!==false
 		||  strpos($date_fmt, "j")!==false) {
-			$URL.='&day='.$this->FormatGedcomDay();
+			$URL.='&day='.$this->FormatGedcomDay();
 			if ($this->d>0)
 				$action="today";
 		}
-		return encode_url($URL.'&action='.$action);
+		return $URL.'&action='.$action;
 	}
 } // class CalendarDate