// alias.php is now included from autoload.php

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7693 b9a71923-0436-4b27-9f14-aed3839534dd

config/autoload.php

@@ -25,6 +25,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+// Include some alias functions
+include_once(dirname(__FILE__).'/alias.php');
+
 function __autoload($className)
 {
 		if (function_exists('smartyAutoload') AND smartyAutoload($className)) 

config/config.inc.php

@@ -76,9 +76,6 @@ require_once(dirname(__FILE__).'/autoload.php');
 if (!defined('_PS_MAGIC_QUOTES_GPC_'))
 	define('_PS_MAGIC_QUOTES_GPC_',         get_magic_quotes_gpc());
 
-// Include some alias functions
-include_once(dirname(__FILE__).'/alias.php');
-
 /* Set the current Shop */
 Context::getContext()->shop = Shop::initialize();
 define('_THEME_NAME_', Context::getContext()->shop->getTheme());