Merge remote-tracking branch 'remotes/upstream/3.8-dev' into j3/names…

…pace/router # Conflicts: # libraries/classmap.php
joomla · May 9, 2017 · 3c49806 · 3c49806
1 parent 294d4af
commit 3c49806
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/libraries/classmap.php b/libraries/classmap.php
@@ -153,3 +153,7 @@
 
 JLoader::registerAlias('JAssociationExtensionInterface',    '\\Joomla\\CMS\\Association\\AssociationExtensionInterface', '4.0');
 JLoader::registerAlias('JAssociationExtensionHelper',       '\\Joomla\\CMS\\Association\\AssociationExtensionHelper', '4.0');
+
+JLoader::registerAlias('JRouter',                           '\\Joomla\\CMS\\Router\\Router', '4.0');
+JLoader::registerAlias('JRouterAdministrator',              '\\Joomla\\CMS\\Router\\AdministratorRouter', '4.0');
+JLoader::registerAlias('JRouterSite',                       '\\Joomla\\CMS\\Router\\SiteRouter', '4.0');