Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not use short echo tags #11703

Merged
merged 1 commit into from
Dec 11, 2018
Merged

Do not use short echo tags #11703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions install-dev/missing_requirement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
<?php endif; ?>
<?php if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < _PS_INSTALL_MINIMUM_PHP_VERSION_ID_): ?>
<li>
PrestaShop requires at least PHP <?= _PS_INSTALL_MINIMUM_PHP_VERSION_ ?> or newer versions.
<i>To install PrestaShop <?= _PS_INSTALL_VERSION_ ?> you need to update your version of PHP.</i>
PrestaShop requires at least PHP <?php echo _PS_INSTALL_MINIMUM_PHP_VERSION_ ?> or newer versions.
<i>To install PrestaShop <?php echo _PS_INSTALL_VERSION_ ?> you need to update your version of PHP.</i>
</li>
<?php endif; ?>
<?php if (!is_writable(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'var'.DIRECTORY_SEPARATOR.'cache')): ?>
Expand Down
18 changes: 9 additions & 9 deletions tools/build/Library/InstallUnpacker/index_template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,16 @@ function getZipErrorMessage($errorCode)
<head>
<meta charset="UTF-8">
<title>PrestaShop installation</title>
<link rel="stylesheet" type="text/css" href="<?= $selfUri; ?>?element=css">
<link rel="stylesheet" type="text/css" href="<?php echo $selfUri; ?>?element=css">
</head>
<body>
<div id="content-install-in-progress"
data-extract-url="<?= $selfUri; ?>"
data-check-version-url="<?= $selfUri; ?>?run=check-version"
data-download-latest-url="<?= $selfUri; ?>">
data-extract-url="<?php echo $selfUri; ?>"
data-check-version-url="<?php echo $selfUri; ?>?run=check-version"
data-download-latest-url="<?php echo $selfUri; ?>">
<div>
<img id="spinner" src="<?= $selfUri; ?>?element=gif"/>
<div id="versionPanel" style="display: none;">Installing Prestashop <?= _PS_VERSION_; ?></div>
<img id="spinner" src="<?php echo $selfUri; ?>?element=gif"/>
<div id="versionPanel" style="display: none;">Installing Prestashop <?php echo _PS_VERSION_; ?></div>
<div id="initializationMessage">Initialization ...</div>
<div id="progressContainer">
<div class="progressNumber">0 %</div>
Expand All @@ -262,7 +262,7 @@ function getZipErrorMessage($errorCode)
</div>
<div id="content-install-form" style="display: none">
<div>
<img id="puffin" src="<?= $selfUri; ?>?element=png-installer"/>
<img id="puffin" src="<?php echo $selfUri; ?>?element=png-installer"/>
<div id="header">
The version you’re about to install is not
the latest version of PrestaShop
Expand All @@ -284,7 +284,7 @@ function getZipErrorMessage($errorCode)
</div>
</div>
</div>
<script type="text/javascript" src="<?= $selfUri; ?>?element=jquery"></script>
<script type="text/javascript" src="<?= $selfUri; ?>?element=js-runner"></script>
<script type="text/javascript" src="<?php echo $selfUri; ?>?element=jquery"></script>
<script type="text/javascript" src="<?php echo $selfUri; ?>?element=js-runner"></script>
</body>
</html>