mikuli.cz

commit 387d7107ef81e4759dc713fb7bb62f21ae70f629
parent cdf2e3b61dd890969f4e05ed06092e7ee8d39b78
Author: markseu <mark2011@mayberg.se>
Date:   Thu,  1 Sep 2016 21:28:03 +0200

System update (API update)

Diffstat:
M
system/plugins/core.php
 | 
32
+++++++++++++++++++-------------

1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -704,6 +704,12 @@ class YellowPage
 		}
 		return $this->yellow->text->getDateFormatted(strtotime($this->get($key)), $format);
 	}
+
+	// Return page meta data as language specific date, HTML encoded
+	function getDateHtml($key, $dateFormat = "")
+	{
+		return htmlspecialchars($this->getDate($key, $dateFormat));
+	}
 	
 	// Return page content, HTML encoded or raw format
 	function getContent($rawFormat = false)
@@ -781,7 +787,7 @@ class YellowPage
 	}
 	
 	// Return page location
-	function getLocation($absoluteLocation = true)
+	function getLocation($absoluteLocation = false)
 	{
 		return $absoluteLocation ? $this->base.$this->location : $this->location;
 	}
@@ -1905,18 +1911,6 @@ class YellowText
 		$this->text[$language][$key] = $value;
 	}
 	
-	// Return text string for specific language
-	function getText($key, $language)
-	{
-		return $this->isExisting($key, $language) ? $this->text[$language][$key] : "[$key]";
-	}
-	
-	// Return text string for specific language, HTML encoded
-	function getTextHtml($key, $language)
-	{
-		return htmlspecialchars($this->getText($key, $language));
-	}
-	
 	// Return text string
 	function get($key)
 	{
@@ -1929,6 +1923,18 @@ class YellowText
 		return htmlspecialchars($this->getText($key, $this->language));
 	}
 	
+	// Return text string for specific language
+	function getText($key, $language)
+	{
+		return $this->isExisting($key, $language) ? $this->text[$language][$key] : "[$key]";
+	}
+	
+	// Return text string for specific language, HTML encoded
+	function getTextHtml($key, $language)
+	{
+		return htmlspecialchars($this->getText($key, $language));
+	}
+	
 	// Return text strings
 	function getData($filterStart = "", $language = "")
 	{