improved language handling for third party context

joomla · Aug 11, 2016 · 8aae1a4 · 8aae1a4
1 parent b1e31cb
commit 8aae1a4
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/libraries/joomla/form/rule/username.php b/libraries/joomla/form/rule/username.php
@@ -40,6 +40,15 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		$result = true;
 		$app    = JFactory::getApplication();
 
+		// Load language files
+		if ($app->isSite())
+		{
+			JFactory::getLanguage()->load('com_users', JPATH_SITE, null, true);
+		}
+		elseif ($app->isAdmin())
+		{
+			JFactory::getLanguage()->load('com_users', JPATH_ADMINISTRATOR, null, true);
+		}
 		// Get the database object and a new query object.
 		$db = JFactory::getDbo();
 		$query = $db->getQuery(true);
@@ -310,9 +319,6 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 			}
 		}
 
-
-
 		return $result;
 	}
 }
-