From 5f47b81211ee1a434b7eef7939550118a2c64fcd Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 11 Mar 2013 15:10:22 +0100
Subject: [PATCH] //replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent
 cache bug with __FILE__

---
 admin-dev/ajax-tab.php           | 4 ++--
 admin-dev/ajax.php               | 2 +-
 admin-dev/ajax_products_list.php | 2 +-
 admin-dev/displayImage.php       | 4 ++--
 admin-dev/drawer.php             | 2 +-
 admin-dev/get-file-admin.php     | 2 +-
 admin-dev/grider.php             | 2 +-
 admin-dev/index.php              | 4 ++--
 admin-dev/searchcron.php         | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin-dev/ajax-tab.php b/admin-dev/ajax-tab.php
index 684278d34..24c751f9d 100755
--- a/admin-dev/ajax-tab.php
+++ b/admin-dev/ajax-tab.php
@@ -25,8 +25,8 @@
 */
 
 define('_PS_ADMIN_DIR_', getcwd());
-require(dirname(__FILE__).'/../config/config.inc.php');
-require(dirname(__FILE__).'/functions.php');
+require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+require(_PS_ADMIN_DIR_.'/functions.php');
 
 // For retrocompatibility with "tab" parameter
 if (!isset($_GET['controller']) && isset($_GET['tab']))
diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php
index 5ec0197ac..8f41e44cb 100644
--- a/admin-dev/ajax.php
+++ b/admin-dev/ajax.php
@@ -27,7 +27,7 @@
 define('_PS_ADMIN_DIR_', getcwd());
 include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 /* Getting cookie or logout */
-require_once(dirname(__FILE__).'/init.php');
+require_once(_PS_ADMIN_DIR_.'/init.php');
 
 $context = Context::getContext();
 
diff --git a/admin-dev/ajax_products_list.php b/admin-dev/ajax_products_list.php
index 64ee54211..f14a9a8c8 100644
--- a/admin-dev/ajax_products_list.php
+++ b/admin-dev/ajax_products_list.php
@@ -27,7 +27,7 @@
 define('_PS_ADMIN_DIR_', getcwd());
 include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 /* Getting cookie or logout */
-require_once(dirname(__FILE__).'/init.php');
+require_once(_PS_ADMIN_DIR_.'/init.php');
 
 $query = Tools::getValue('q', false);
 if (!$query OR $query == '' OR strlen($query) < 1)
diff --git a/admin-dev/displayImage.php b/admin-dev/displayImage.php
index e48f4f290..f873fdb22 100644
--- a/admin-dev/displayImage.php
+++ b/admin-dev/displayImage.php
@@ -25,8 +25,8 @@
 */
 
 define('_PS_ADMIN_DIR_', getcwd());
-require_once(dirname(__FILE__).'/../config/config.inc.php');
-require_once(dirname(__FILE__).'/init.php');
+require_once(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+require_once(_PS_ADMIN_DIR_.'/init.php');
 
 if (isset($_GET['img']) AND Validate::isMd5($_GET['img']) AND isset($_GET['name']) AND Validate::isGenericName($_GET['name']) AND file_exists(_PS_UPLOAD_DIR_.$_GET['img']))
 {
diff --git a/admin-dev/drawer.php b/admin-dev/drawer.php
index d155d25c5..c52ea4547 100644
--- a/admin-dev/drawer.php
+++ b/admin-dev/drawer.php
@@ -25,7 +25,7 @@
 */
 
 define('_PS_ADMIN_DIR_', getcwd());
-include_once(dirname(__FILE__).'/../config/config.inc.php');
+include_once(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 
 $module = Tools::getValue('module');
 $render = Tools::getValue('render');
diff --git a/admin-dev/get-file-admin.php b/admin-dev/get-file-admin.php
index 1a6c855db..b37f691e5 100644
--- a/admin-dev/get-file-admin.php
+++ b/admin-dev/get-file-admin.php
@@ -25,5 +25,5 @@
 */
 
 define('_PS_ADMIN_DIR_', getcwd());
-require(dirname(dirname(__FILE__)).'/config/config.inc.php');
+require(_PS_ADMIN_DIR_.'/config/config.inc.php');
 Controller::getController('GetFileController')->run();
\ No newline at end of file
diff --git a/admin-dev/grider.php b/admin-dev/grider.php
index 0ba54a8a6..6e97baf68 100644
--- a/admin-dev/grider.php
+++ b/admin-dev/grider.php
@@ -25,7 +25,7 @@
 */
 
 define('_PS_ADMIN_DIR_', getcwd());
-include_once(dirname(__FILE__).'/../config/config.inc.php');
+include_once(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 
 $module = Tools::getValue('module');
 $render = Tools::getValue('render');
diff --git a/admin-dev/index.php b/admin-dev/index.php
index 6da63272e..f5fcc246d 100644
--- a/admin-dev/index.php
+++ b/admin-dev/index.php
@@ -27,8 +27,8 @@
 $timer_start = microtime(true);
 define('_PS_ADMIN_DIR_', getcwd());
 
-require(dirname(__FILE__).'/../config/config.inc.php');
-require(dirname(__FILE__).'/functions.php');
+require(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+require(_PS_ADMIN_DIR_.'/functions.php');
 
 //small test to clear cache after upgrade
 if (Configuration::get('PS_UPGRADE_CLEAR_CACHE'))
diff --git a/admin-dev/searchcron.php b/admin-dev/searchcron.php
index d3f75c9b4..c6a772464 100644
--- a/admin-dev/searchcron.php
+++ b/admin-dev/searchcron.php
@@ -25,7 +25,7 @@
 */
 
 define('_PS_ADMIN_DIR_', getcwd());
-include(dirname(__FILE__).'/../config/config.inc.php');
+include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 Context::getContext()->shop->setContext(Shop::CONTEXT_ALL);
 
 if (substr(_COOKIE_KEY_, 34, 8) != Tools::getValue('token'))