More bugfixes. The SimpleSAML\Locale\Language::$languageParameterName and...

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

@@ -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.
      *

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.
      *

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>';
 				}
 			}