Merge pull request #4544 from apphp/master

fix/static method getCanonicalID should not be called dynamically

Author: marcovtwout

framework/i18n/CLocale.php

@@ -330,7 +330,7 @@ public function getPluralRules()
 	public function getLanguageID($id)
 	{
 		// normalize id
-		$id = $this->getCanonicalID($id);
+		$id = self::getCanonicalID($id);
 		// remove sub tags
 		if(($underscorePosition=strpos($id, '_'))!== false)
 		{
@@ -349,7 +349,7 @@ public function getLanguageID($id)
 	public function getScriptID($id)
 	{
 		// normalize id
-		$id = $this->getCanonicalID($id);
+		$id = self::getCanonicalID($id);
 		// find sub tags
 		if(($underscorePosition=strpos($id, '_'))!==false)
 		{
@@ -381,7 +381,7 @@ public function getScriptID($id)
 	public function getTerritoryID($id)
 	{
 		// normalize id
-		$id = $this->getCanonicalID($id);
+		$id = self::getCanonicalID($id);
 		// find sub tags
 		if (($underscorePosition=strpos($id, '_'))!== false)
 		{
@@ -417,7 +417,7 @@ public function getTerritoryID($id)
 	 */
 	public function getLocaleDisplayName($id=null, $category='languages')
 	{
-		$id = $this->getCanonicalID((string)$id);
+		$id = self::getCanonicalID((string)$id);
 		if (($category == 'languages') && (isset($this->_data[$category][$id])))
 		{
 			return $this->_data[$category][$id];