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

// htaccess is not generated during install

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11674 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-12-22 19:18:08 +00:00
parent 7a09986e0c
commit 8f8c1e705c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+4 -1
View File
@@ -1302,7 +1302,7 @@ class ToolsCore
public static function simplexml_load_file($url, $class_name = null)
{
if (in_array(ini_get('allow_url_fopen'), array('On', 'on', '1')))
return simplexml_load_string(Tools::file_get_contents($url), $class_name);
return @simplexml_load_string(Tools::file_get_contents($url), $class_name);
else
return false;
}
@@ -1495,6 +1495,9 @@ class ToolsCore
public static function generateHtaccess($path, $rewrite_settings, $cache_control, $specific = '', $disable_multiviews = false)
{
if (defined('PS_INSTALLATION_IN_PROGRESS'))
return;
// Check current content of .htaccess and save all code outside of prestashop comments
$specific_before = $specific_after = '';
if (file_exists($path))