From 90efde2a00439dfa90bceb455758a5d9c51010f2 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Fri, 22 Jul 2011 12:36:57 +0000
Subject: [PATCH] // 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   | 3 +++
 config/config.inc.php | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/autoload.php b/config/autoload.php
index d58391e96..a18916322 100644
--- a/config/autoload.php
+++ b/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)) 
diff --git a/config/config.inc.php b/config/config.inc.php
index bbd6e20eb..9e83230d4 100644
--- a/config/config.inc.php
+++ b/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());