dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-09-20 15:53:57 +00:00
parent b9e7daf0b7
commit b45dd02452
79 changed files with 339 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminTab.php
+1 -1
View File
@@ -364,7 +364,7 @@ abstract class AdminTabCore
$classname = 'Admin'.$subtab;
if ($module = Db::getInstance()->getValue('SELECT `module` FROM `'._DB_PREFIX_.'tab` WHERE `class_name` = \''.pSQL($classname).'\'') AND file_exists(_PS_MODULE_DIR_.'/'.$module.'/'.$classname.'.php'))
include_once(_PS_MODULE_DIR_.'/'.$module.'/'.$classname.'.php');
elseif (file_exists(PS_ADMIN_DIR.'/tabs/'.$classname.'.php'))
elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$classname.'.php'))
include_once('tabs/'.$classname.'.php');
if (!isset($this->_includeObj[$key]))
$this->_includeObj[$key] = new $classname;
classes/shop/Shop.php
+4 -4
View File
@@ -209,7 +209,7 @@ class ShopCore extends ObjectModel
$excluded_uris[] = $directory;
// Find current shop from URL
if (!$id_shop = Tools::getValue('id_shop') && !defined('PS_ADMIN_DIR'))
if (!$id_shop = Tools::getValue('id_shop') && !defined('_PS_ADMIN_DIR_'))
{
$sql = 'SELECT s.id_shop, CONCAT(su.physical_uri, su.virtual_uri) AS uri
FROM '._DB_PREFIX_.'shop_url su
@@ -313,7 +313,7 @@ class ShopCore extends ObjectModel
*/
public function getGroupID()
{
if (defined('PS_ADMIN_DIR'))
if (defined('_PS_ADMIN_DIR_'))
return Shop::getContextGroupID();
return (int)$this->id_group_shop;
}
@@ -541,7 +541,7 @@ class ShopCore extends ObjectModel
$shopID = $context->shop->id;
$shopGroupID = $context->shop->id_group_shop;
if (defined('PS_ADMIN_DIR'))
if (defined('_PS_ADMIN_DIR_'))
{
if (!isset($context->cookie) || !$context->cookie->shopContext)
return ($type == 'shop' || $type == 'group') ? '' : array('', '');
@@ -561,7 +561,7 @@ class ShopCore extends ObjectModel
if (!$executed)
{
$context = Context::getContext();
if (defined('PS_ADMIN_DIR'))
if (defined('_PS_ADMIN_DIR_'))
{
// While cookie is not instancied in admin, we wait ...
if (!isset($context->cookie))