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

[-] Installer : added ob_start() (required with the cookie mode when debug mode is activated)

Browse Source
This commit is contained in:
Damien Metzger
2013-08-19 10:04:23 +02:00
parent c5097b19cc
commit 218ce59de6
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/index.php
+4 -7
View File
@@ -24,14 +24,11 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
require_once 'init.php'; require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'init.php');
try try {
{ require_once(_PS_INSTALL_PATH_.'classes'.DIRECTORY_SEPARATOR.'controllerHttp.php');
require_once _PS_INSTALL_PATH_.'classes/controllerHttp.php';
InstallControllerHttp::execute(); InstallControllerHttp::execute();
} } catch (PrestashopInstallerException $e) {
catch (PrestashopInstallerException $e)
{
$e->displayMessage(); $e->displayMessage();
} }
install-dev/init.php
+5 -3
View File
@@ -24,6 +24,8 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
ob_start();
// Check PHP version // Check PHP version
if (version_compare(PHP_VERSION, '5.1.3', '<')) if (version_compare(PHP_VERSION, '5.1.3', '<'))
die('You need at least PHP 5.1.3 to run PrestaShop. Your current PHP version is '.PHP_VERSION); die('You need at least PHP 5.1.3 to run PrestaShop. Your current PHP version is '.PHP_VERSION);
@@ -37,7 +39,7 @@ define('_PS_INSTALL_MODELS_PATH_', _PS_INSTALL_PATH_.'models/');
define('_PS_INSTALL_LANGS_PATH_', _PS_INSTALL_PATH_.'langs/'); define('_PS_INSTALL_LANGS_PATH_', _PS_INSTALL_PATH_.'langs/');
define('_PS_INSTALL_FIXTURES_PATH_', _PS_INSTALL_PATH_.'fixtures/'); define('_PS_INSTALL_FIXTURES_PATH_', _PS_INSTALL_PATH_.'fixtures/');
require_once(_PS_INSTALL_PATH_ . 'install_version.php'); require_once(_PS_INSTALL_PATH_.'install_version.php');
// we check if theses constants are defined // we check if theses constants are defined
// in order to use init.php in upgrade.php script // in order to use init.php in upgrade.php script
@@ -71,8 +73,8 @@ if (!@ini_get('date.timezone'))
ini_set('magic_quotes_runtime', 0); ini_set('magic_quotes_runtime', 0);
// Try to improve memory limit if it's under 32M // Try to improve memory limit if it's under 32M
if (psinstall_get_memory_limit() < psinstall_get_octets('32M')) if (psinstall_get_memory_limit() < psinstall_get_octets('64M'))
ini_set('memory_limit', '32M'); ini_set('memory_limit', '64M');
function psinstall_get_octets($option) function psinstall_get_octets($option)
{ {