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

// REVERT MERGE

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Language.php
+6 -12
View File
@@ -103,8 +103,7 @@ class LanguageCore extends ObjectModel
return ($resUpdateSQL AND Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
Configuration::get('PS_HTACCESS_SPECIFIC'),
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
Configuration::get('PS_HTACCESS_SPECIFIC')
));
}
@@ -119,8 +118,7 @@ class LanguageCore extends ObjectModel
return (Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
Configuration::get('PS_HTACCESS_SPECIFIC'),
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
Configuration::get('PS_HTACCESS_SPECIFIC')
));
}
@@ -292,8 +290,7 @@ class LanguageCore extends ObjectModel
foreach($tables as $table)
foreach($table as $t)
if ($t != _DB_PREFIX_.'configuration_lang')
$langTables[] = $t;
$langTables[] = $t;
Db::getInstance()->Execute('SET @id_lang_default = (SELECT c.`value` FROM `'._DB_PREFIX_.'configuration` c WHERE c.`name` = \'PS_LANG_DEFAULT\' LIMIT 1)');
$return = true;
@@ -406,8 +403,7 @@ class LanguageCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
Configuration::get('PS_HTACCESS_SPECIFIC'),
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
Configuration::get('PS_HTACCESS_SPECIFIC')
);
}
@@ -430,8 +426,7 @@ class LanguageCore extends ObjectModel
Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
Configuration::get('PS_HTACCESS_SPECIFIC'),
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
Configuration::get('PS_HTACCESS_SPECIFIC')
);
return $result;
@@ -571,8 +566,7 @@ class LanguageCore extends ObjectModel
return Tools::generateHtaccess(dirname(__FILE__).'/../.htaccess',
(int)(Configuration::get('PS_REWRITING_SETTINGS')),
(int)(Configuration::get('PS_HTACCESS_CACHE_CONTROL')),
Configuration::get('PS_HTACCESS_SPECIFIC'),
(int)Configuration::get('PS_HTACCESS_DISABLE_MULTIVIEWS')
Configuration::get('PS_HTACCESS_SPECIFIC')
);
}