Merge pull request #617 from realityking/jrequest2

Don't load JRequest when it isn't used.
joomla · Dec 9, 2011 · 1096c6b · 1096c6b
2 parents 40f5a06 + 9969c77
commit 1096c6b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/libraries/import.php b/libraries/import.php
@@ -58,7 +58,6 @@ class_exists('JLoader') or die;
 JLoader::import('joomla.factory');
 
 // Import the exception and error handling libraries.
-JLoader::import('joomla.error.error');
 JLoader::import('joomla.error.exception');
 
 /*
@@ -67,7 +66,7 @@ class_exists('JLoader') or die;
  */
 if (isset($_SERVER['HTTP_HOST']))
 {
-	JLoader::import('joomla.environment.request');
+	JLoader::register('JRequest', JPATH_PLATFORM . '/joomla/environment/request.php');
 
 	// If an application flags it doesn't want this, adhere to that.
 	if (!defined('_JREQUEST_NO_CLEAN') && (bool) ini_get('register_globals'))