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

// merge form 1.4 version (rev. 5937)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5938 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-04-15 16:46:20 +00:00
parent d71ca0a6d7
commit 6f98aff114
3 changed files with 89 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/index.php
+2 -3
View File
@@ -97,7 +97,7 @@ if ($lm->getIncludeTradFilename())
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Cache" content="no store" />
<meta http-equiv="Expires" content="-1" />
<title><?php echo lang('PrestaShop '.INSTALL_VERSION.' Installer')?></title>
<title><?php echo lang('PrestaShop '.INSTALL_VERSION.' Installer'); ?></title>
<link rel="stylesheet" type="text/css" media="all" href="view.css"/>
<script type="text/javascript" src="<?php echo PS_BASE_URI ?>js/jquery/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="<?php echo PS_BASE_URI ?>js/jquery/ajaxfileupload.js"></script>
@@ -609,7 +609,7 @@ if ($lm->getIncludeTradFilename())
return '';
}
$context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));
$context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 3)));
$content = @file_get_contents('https://www.prestashop.com/partner/preactivation/partners.php?version=1.0', false, $context);
if ($content && $content[0] == '<')
{
@@ -829,7 +829,6 @@ if ($lm->getIncludeTradFilename())
$countNonNative = 0;
if ($oldversion !== false)
{
include_once(realpath(INSTALL_PATH.'/../config').'/settings.inc.php');
include_once(realpath(INSTALL_PATH.'/../config').'/config.inc.php');
$moduleList = Module::getNonNativeModuleList();
$moduleNonNativeLi = '<ul>';