Skip to content

Commit 106e6eb

Browse files
authored
Merge pull request #633 from PrestaShop/dev
Release 4.16.4
2 parents f668dd2 + f17f38b commit 106e6eb

File tree

5 files changed

+30
-17
lines changed

5 files changed

+30
-17
lines changed

README.md

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,32 @@
99
## About
1010

1111
This module allows to upgrade your shop to a more recent version of PrestaShop. It can used as a CLI tool or with a web assistant.
12-
This module is compatible with all PrestaShop 1.7 versions.
12+
The latest versions of the module are compatible with all PrestaShop 1.7 and higher releases.
1313

14-
# Branches
14+
> [!IMPORTANT]
15+
> This module has a specific [Release Process][release-process]. If you do release a new version, make sure to follow it.
16+
17+
## Branches
1518

1619
Branch `develop` contains code for future versions of the module, which allow upgrades from 1.7.x versions to higher.
20+
1721
Branch `4.14.x` contains code for `4.14.x` patch versions which allow upgrading from 1.6.x versions to 1.7.x .
1822

19-
If you wish to upgrade a shop powered by PrestaShop 1.6, please use the latest 4.14.x version to upgrade to a 1.7 version.
23+
If you wish to upgrade a shop powered by PrestaShop 1.6, **please use the latest 4.14.3 version** to upgrade to a 1.7 version.
2024
Upgrades from 1.6.x to 8.x should be done in 2 steps (1.6.x to 1.7.x then 1.7.x to 8.x).
2125

2226
Please note PrestaShop 1.6 and older are not maintained anymore.
2327

24-
# Prerequisites
28+
## Prerequisites
2529

2630
* PrestaShop 1.7 or 8
2731
* PHP 5.6+
2832

29-
# Installation
33+
## Installation
3034

3135
All versions can be found in the [releases list](https://github.com/PrestaShop/autoupgrade/releases).
3236

33-
## Create a module from source code
37+
### Create a module from source code
3438

3539
If you download a ZIP archive that contains the source code or if you want to use the current state of the code, you need to build the module from the sources:
3640

@@ -39,14 +43,14 @@ If you download a ZIP archive that contains the source code or if you want to us
3943
* Create a new ZIP archive from the of **autoupgrade** folder.
4044
* Now you can install it in your shop. For example, you can upload it using the dropzone in Module Manager back office page.
4145

42-
# Running an upgrade on PrestaShop
46+
## Running an upgrade on PrestaShop
4347

4448
Upgrading a shop can be done using:
4549

4650
* the configuration page of the module (browse the back office page provided by the module)
4751
* in command line by calling the file *cli-upgrade.php*
4852

49-
## Command line parameters
53+
### Command line parameters
5054

5155
Upgrade can be automated by calling *cli-upgrade.php*.
5256
The following parameters are mandatory:
@@ -59,12 +63,12 @@ The following parameters are mandatory:
5963
$ php cli-upgrade.php --dir=admin-dev --channel=major
6064
```
6165

62-
# Rollback a shop
66+
## Rollback a shop
6367

6468
If an error occurs during the upgrade process, the rollback will be suggested.
6569
In case you lost the page from your backoffice, note it can be triggered via CLI.
6670

67-
## Command line parameters
71+
### Command line parameters
6872

6973
Rollback can be automated by calling *cli-rollback.php*.
7074
The following parameters are mandatory:
@@ -76,26 +80,27 @@ The following parameters are mandatory:
7680
$ php cli-rollback.php --dir=admin-dev --backup=V1.7.5.1_20190502-191341-22e883bd
7781
```
7882

79-
# Documentation
83+
## Documentation
8084

8185
Documentation is hosted on [the Developer documentation][doc].
8286

83-
# Contributing
87+
## Contributing
8488

8589
PrestaShop modules are open source extensions to the [PrestaShop e-commerce platform][prestashop]. Everyone is welcome and even encouraged to contribute with their own improvements!
8690

8791
Just make sure to follow our [contribution guidelines][contribution-guidelines].
8892

89-
## Reporting issues
93+
### Reporting issues
9094

9195
You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue].
9296

93-
# License
97+
## License
9498

9599
This module is released under the [Academic Free License 3.0][AFL-3.0]
96100

97101
[report-issue]: https://github.com/PrestaShop/PrestaShop/issues/new/choose
98102
[prestashop]: https://www.prestashop-project.org/
99103
[contribution-guidelines]: https://devdocs.prestashop-project.org/8/contribute/contribution-guidelines/project-modules/
100104
[AFL-3.0]: https://opensource.org/licenses/AFL-3.0
101-
[doc]: https://devdocs.prestashop-project.org/8/development/upgrade-module/
105+
[doc]: https://devdocs.prestashop-project.org/8/basics/keeping-up-to-date/upgrade-module/
106+
[release-process]: https://www.prestashop-project.org/maintainers-guide/processes/release/autoupgrade/

autoupgrade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct()
3636
$this->name = 'autoupgrade';
3737
$this->tab = 'administration';
3838
$this->author = 'PrestaShop';
39-
$this->version = '4.16.3';
39+
$this->version = '4.16.4';
4040
$this->need_instance = 1;
4141

4242
$this->bootstrap = true;

classes/UpgradeSelfCheck.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,10 @@ public function isApacheModRewriteEnabled()
526526
*/
527527
public function checkKeyGeneration()
528528
{
529+
if ($this->upgrader->version_num === null) {
530+
return true;
531+
}
532+
529533
// Check if key is needed on the version we are upgrading to, if lower, not needed
530534
if (version_compare($this->upgrader->version_num, '8.1.0', '<')) {
531535
return true;

config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<module>
33
<name>autoupgrade</name>
44
<displayName><![CDATA[1-Click Upgrade]]></displayName>
5-
<version><![CDATA[4.16.3]]></version>
5+
<version><![CDATA[4.16.4]]></version>
66
<description><![CDATA[Upgrade to the latest version of PrestaShop in a few clicks, thanks to this automated method.]]></description>
77
<author><![CDATA[PrestaShop]]></author>
88
<tab><![CDATA[administration]]></tab>

upgrade/sql/8.1.2.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ We fixed it for people installing fresh 8.1.2, but we also need to fix it for pe
99
UPDATE `PREFIX_tab` SET wording_domain = 'Admin.Navigation.Menu', wording = 'Security' WHERE class_name = 'AdminParentSecurity';
1010
UPDATE `PREFIX_tab` SET wording_domain = 'Admin.Navigation.Menu', wording = 'Employee Sessions' WHERE class_name = 'AdminSecuritySessionEmployee';
1111
UPDATE `PREFIX_tab` SET wording_domain = 'Admin.Navigation.Menu', wording = 'Customer Sessions' WHERE class_name = 'AdminSecuritySessionCustomer';
12+
13+
INSERT IGNORE INTO `PREFIX_hook` (`id_hook`, `name`, `title`, `description`, `position`) VALUES
14+
(NULL, 'actionLanguageLinkParameters', 'Add parameters to language link', 'Allows modules to provide proper parameters for links in other languages.', '1'),
15+
(NULL, 'actionAfterLoadRoutes', 'Triggers after loading routes', 'Allow modules to modify routes in any way or add their own multilanguage routes.', '1');

0 commit comments

Comments
 (0)