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

// htaccess is not generated during install

Browse Source
This commit is contained in:
rMalie
2011-12-22 19:18:08 +00:00
parent da4d54e7a2
commit 508a7e687e
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) public static function simplexml_load_file($url, $class_name = null)
{ {
if (in_array(ini_get('allow_url_fopen'), array('On', 'on', '1'))) 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 else
return false; return false;
} }
@@ -1495,6 +1495,9 @@ class ToolsCore
public static function generateHtaccess($path, $rewrite_settings, $cache_control, $specific = '', $disable_multiviews = false) 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 // Check current content of .htaccess and save all code outside of prestashop comments
$specific_before = $specific_after = ''; $specific_before = $specific_after = '';
if (file_exists($path)) if (file_exists($path))
install-new/init.php
+1
View File
@@ -28,6 +28,7 @@
define('_PS_INSTALL_VERSION_', '1.5.0.0'); define('_PS_INSTALL_VERSION_', '1.5.0.0');
// Generate common constants // Generate common constants
define('PS_INSTALLATION_IN_PROGRESS', true);
define('_PS_INSTALL_PATH_', dirname(__FILE__).'/'); define('_PS_INSTALL_PATH_', dirname(__FILE__).'/');
define('_PS_INSTALL_DATA_PATH_', _PS_INSTALL_PATH_.'data/'); define('_PS_INSTALL_DATA_PATH_', _PS_INSTALL_PATH_.'data/');
define('_PS_INSTALL_CONTROLLERS_PATH_', _PS_INSTALL_PATH_.'controllers/'); define('_PS_INSTALL_CONTROLLERS_PATH_', _PS_INSTALL_PATH_.'controllers/');