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

[-] IN : bad path in create multistore

Browse Source
This commit is contained in:
gRoussac
2013-11-06 18:06:19 +01:00
parent 76b03856e2
commit fc6041fa33
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/create_multistore.php
+4 -4
View File
@@ -41,10 +41,10 @@ function create_multistore()
// @todo generate __PS_BASE_URI__ using $_SERVER['REQUEST_URI'], just in case // @todo generate __PS_BASE_URI__ using $_SERVER['REQUEST_URI'], just in case
return false; return false;
} }
$all_themes_dir = _PS_ROOT_DIR_.'/themes'; $all_themes_dir = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'themes';
$themes = scandir($all_themes_dir); $themes = scandir($all_themes_dir);
foreach ($themes AS $theme) foreach ($themes AS $theme)
if (is_dir($all_themes_dir.'/'.$theme) if (is_dir($all_themes_dir.DIRECTORY_SEPARATOR.$theme.DIRECTORY_SEPARATOR)
&& $theme[0] != '.' && $theme[0] != '.'
&& $theme != 'prestashop') && $theme != 'prestashop')
{ {
@@ -73,8 +73,8 @@ function create_multistore()
$shop_domain_ssl = create_multistore_getHttpHost(); $shop_domain_ssl = create_multistore_getHttpHost();
} }
$_PS_DIRECTORY_ = trim(str_replace(' ', '%20', $INSTALLER__PS_BASE_URI), '/'); $_PS_DIRECTORY_ = trim(str_replace(' ', '%20', $INSTALLER__PS_BASE_URI), DIRECTORY_SEPARATOR);
$_PS_DIRECTORY_ = ($_PS_DIRECTORY_) ? '/'.$_PS_DIRECTORY_.'/' : '/'; $_PS_DIRECTORY_ = ($_PS_DIRECTORY_) ? '/'.$_PS_DIRECTORY_.DIRECTORY_SEPARATOR : DIRECTORY_SEPARATOR;
$res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) $res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`)
VALUES(1, \''.pSQL($shop_domain).'\', \''.pSQL($shop_domain_ssl).'\', \''.pSQL($_PS_DIRECTORY_).'\', \'\', 1, 1)'); VALUES(1, \''.pSQL($shop_domain).'\', \''.pSQL($shop_domain_ssl).'\', \''.pSQL($_PS_DIRECTORY_).'\', \'\', 1, 1)');
install-dev/upgrade/php/update_customer_default_group.php
+1 -1
View File
@@ -68,7 +68,7 @@ function update_customer_default_group()
if($result && file_exists($filename_old)) if($result && file_exists($filename_old))
{ {
unlink($filename_old); unlink($filename_old);
chmod($filename, 0664); @chmod($filename, 0664);
} }
} }
return $result; return $result;