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

// merge 1.4 (5397)

Browse Source
This commit is contained in:
fBrignoli
2011-04-22 16:00:58 +00:00
parent 0cd5856fe5
commit ff49083fb6
126 changed files with 3390 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/index.php
+5 -10
View File
@@ -784,7 +784,7 @@ if ($lm->getIncludeTradFilename())
<td id="endEmail" class="resultEnd">&nbsp;</td>
</tr>
</table>
<h3><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt).'); ?></h3>
<h3><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>
<a href="../admin" id="access" class="BO" target="_blank">
<span class="title"><?php echo lang('Back Office'); ?></span>
@@ -826,10 +826,10 @@ if ($lm->getIncludeTradFilename())
{
return strnatcmp($a['version'], $b['version']);
}
$countNonNative = 0;
if ($oldversion !== false)
$countNonNative = 0;
if ($oldversion !== false AND !$sameVersions)
{
include_once(realpath(INSTALL_PATH.'/../config').'/config.inc.php');
include_once(realpath(INSTALL_PATH.'/../config').'/defines.inc.php');
$moduleList = Module::getNonNativeModuleList();
$moduleNonNativeLi = '<ul>';
foreach($moduleList as $module)
@@ -1059,17 +1059,12 @@ if ($lm->getIncludeTradFilename())
?>
<h3 style="margin-top: 15px;"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt).'); ?></h3>
<h3 style="margin-top: 15px;"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder and readme files (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'); ?></h3>
<a href="../" id="access_update" target="_blank">
<span class="title"><?php echo lang('Front Office'); ?></span>
<span class="description"><?php echo lang('Find your store as your future customers will see!'); ?></span>
<span class="message"><?php echo lang('Discover your store'); ?></span>
</a>
<span href="#" id="access" class="BO" target="_blank">
<span class="title"><?php echo lang('Back Office'); ?></span>
<span class="description"><?php echo lang('Manage your store with your back office. Manage your orders and customers, add modules, change your theme, etc...'); ?></span>
<span class="message"><?php echo lang('Manage your store'); ?></span>
</span>
</div>
<?php
if (@fsockopen('addons.prestashop.com', 80, $errno, $errst, 3)): ?>