From c39d1b8c7e8541eb655eb00fb013255505742b3a Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Fri, 5 Feb 2016 15:24:46 +0100
Subject: [PATCH] More bugfixes. The
SimpleSAML\Locale\Language::$languageParameterName and
SimpleSAML\Locale\Language::$language properties should be private, and
therefore not accessed from the outside of their respective classes. Add
getters instead.
---
lib/SimpleSAML/Locale/Language.php | 13 ++++++++++++-
lib/SimpleSAML/Locale/Translate.php | 11 +++++++++++
templates/includes/header.php | 2 +-
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/Locale/Language.php b/lib/SimpleSAML/Locale/Language.php
index 544e20d4a..7d2279191 100644
--- a/lib/SimpleSAML/Locale/Language.php
+++ b/lib/SimpleSAML/Locale/Language.php
@@ -28,7 +28,7 @@ class Language
/**
* HTTP GET language parameter name.
*/
- public $languageParameterName = 'language';
+ private $languageParameterName = 'language';
/**
@@ -113,6 +113,17 @@ class Language
}
+ /**
+ * Get the language parameter name.
+ *
+ * @return string The language parameter name.
+ */
+ public function getLanguageParameterName()
+ {
+ return $this->languageParameterName;
+ }
+
+
/**
* This method returns the preferred language for the user based on the Accept-Language HTTP header.
*
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 01de9e0bd..ebbac3275 100644
--- a/lib/SimpleSAML/Locale/Translate.php
+++ b/lib/SimpleSAML/Locale/Translate.php
@@ -68,6 +68,17 @@ class Translate
}
+ /**
+ * Return the internal language object used by this translator.
+ *
+ * @return \SimpleSAML\Locale\Language
+ */
+ public function getLanguage()
+ {
+ return $this->language;
+ }
+
+
/**
* This method retrieves a dictionary with the name given.
*
diff --git a/templates/includes/header.php b/templates/includes/header.php
index 3982c8bf5..f0c4e4df3 100644
--- a/templates/includes/header.php
+++ b/templates/includes/header.php
@@ -191,7 +191,7 @@ if($onLoad !== '') {
if ($current) {
$textarray[] = $langnames[$lang];
} else {
- $textarray[] = '<a href="' . htmlspecialchars(\SimpleSAML\Utils\HTTP::addURLParameters(\SimpleSAML\Utils\HTTP::getSelfURL(), array($this->getTranslator()->language->languageParameterName => $lang))) . '">' .
+ $textarray[] = '<a href="' . htmlspecialchars(\SimpleSAML\Utils\HTTP::addURLParameters(\SimpleSAML\Utils\HTTP::getSelfURL(), array($this->getTranslator()->getLanguage()->getLanguageParameterName() => $lang))) . '">' .
$langnames[$lang] . '</a>';
}
}
--
GitLab