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

// Removed some warnings in the updater

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16770 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-09 07:24:03 +00:00
parent 04e3f3f6f5
commit 4f99dfd2d6
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/upgrade/php/update_mailalerts_add_column_idshop.php
+3 -10
View File
@@ -6,15 +6,8 @@
function update_mailalerts_add_column_idshop() function update_mailalerts_add_column_idshop()
{ {
$id_mailalerts = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "mailalerts"'); $installed = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "mailalerts"');
if ($installed && !Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'mailalert_customer_oos` ADD COLUMN `id_shop` int(11) NOT NULL default "0" AFTER `id_customer`'))
if($id_mailalerts) return array('error' => 1, 'msg' => sprintf('unable to create column id_shop (%s)', Db::getInstance ()->getMsgError()));
{
$res = Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'mailalert_customer_oos` ADD COLUMN `id_shop` int(11) NOT NULL default "0" AFTER `id_customer`');
if ($res)
return true;
else
return array('error' => 1, 'msg' => sprintf('unable to create column id_shop (%s)', Db::getInstance ()->getMsgError()));
}
return true; return true;
} }
install-dev/upgrade/upgrade.php
+9 -9
View File
@@ -362,22 +362,22 @@ if (empty($fail_result))
} }
// Settings updated, compile and cache directories must be emptied // Settings updated, compile and cache directories must be emptied
$tools_dir = rtrim(_PS_INSTALL_PATH_, '\\/').DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'tools'.DIRECTORY_SEPARATOR;
$arrayToClean = array( $arrayToClean = array(
_PS_INSTALL_PATH_.'/../tools/smarty/cache/', $tools_dir.'smarty'.DIRECTORY_SEPARATOR.'cache',
_PS_INSTALL_PATH_.'/../tools/smarty/compile/', $tools_dir.'smarty'.DIRECTORY_SEPARATOR.'compile',
_PS_INSTALL_PATH_.'/../tools/smarty_v2/cache/', $tools_dir.'smarty_v2'.DIRECTORY_SEPARATOR.'cache',
_PS_INSTALL_PATH_.'/../tools/smarty_v2/compile/'); $tools_dir.'smarty_v2'.DIRECTORY_SEPARATOR.'compile'
);
foreach ($arrayToClean as $dir) foreach ($arrayToClean as $dir)
if (!file_exists($dir)) if (file_exists($dir))
$logger->logError('directory '.$dir." doesn't exist and can't be emptied.\r\n");
else
foreach (scandir($dir) as $file) foreach (scandir($dir) as $file)
if ($file[0] != '.' AND $file != 'index.php' AND $file != '.htaccess') if ($file[0] != '.' AND $file != 'index.php' AND $file != '.htaccess')
unlink($dir.$file); unlink($dir.DIRECTORY_SEPARATOR.$file);
// delete cache filesystem if activated // delete cache filesystem if activated
$depth = Configuration::get('PS_CACHEFS_DIRECTORY_DEPTH'); $depth = Configuration::get('PS_CACHEFS_DIRECTORY_DEPTH');
if((defined('_PS_CACHE_ENABLED_') && _PS_CACHE_ENABLED_ ) && $depth) if (defined('_PS_CACHE_ENABLED_') && _PS_CACHE_ENABLED_ && $depth)
{ {
CacheFs::deleteCacheDirectory(); CacheFs::deleteCacheDirectory();
CacheFs::createCacheDirectories((int)$depth); CacheFs::createCacheDirectories((int)$depth);