EZP-30834: remove strtotime function from the trashed-days option #1441
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mateuszbieniek
approved these changes
Sep 10, 2019
|
Please note that the test fails to reasons not related to this PR. |
konradoboza
approved these changes
Sep 10, 2019
glye
approved these changes
Sep 10, 2019
|
Hi @glye , About the rebase you are asking for. Are you sure about rebase on 2017.12? this branch is kind of 100 commits behind 2019.03 and it does not include any of the work done here: I can also
Does it make sense? Thank you :) |
|
Merging, indeed this only makes sense on 2019.03 as this is bug fix for new feature added in 2019.03/2.5. |
|
Beautiful! |
|
Great. Sorry I missed your answer, @carlosmauri |
Opencontent
pushed a commit
to Opencontent/ezpublish-legacy
that referenced
this pull request
Mar 17, 2020
* commit 'c49eef93f50c665a3d7a6b2aa6387ccd46e059f5': Removed invalid constructor call Fixed wrong old-style constructor usage EZP-31040: Remote Code Execution in file uploads Show images after used url_prefix (ezsystems#1453) improve php 7 bc doc (ezsystems#1452) Fix notice when checking for anonymous classes in autoload generator (ezsystems#1450) Do not support literal HTML in the Administration Interface (ezsystems#1408) Fix transformURI() on ignoreIndexDir & ! htmlEscape (ezsystems#1449) Make autoloads ignore anonymous classes (ezsystems#1448) Update php7.md Fixing search in media lib which used to loose context (ezsystems#1433) [Travis] Add testing for PHP 7.2 and 7.3 (ezsystems#1446) EZP-30834: remove strtotime function from the trashed-days option (ezsystems#1441) Fix instances of count() that would cause a warning in 7.2 Updated dbupdate scripts so they will no longer fail when there are multiple users with the same e-mail (ezsystems#1445)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On a recent client work we noticed that the trashpurge.php wasn't working as expected.
This PR fix that issue.
Summary:
The following line within the trashpurge.php script:
$options['trashed-days'] ? strtotime( "-{$options['trashed-days']} days" ) : nullIs converting the trashed days into the wrong value.
This is because we already have the same strtotime function in here:
https://github.com/ezsystems/ezpublish-legacy/blob/2019.03/kernel/private/classes/ezscripttrashpurge.php#L88
The commit fix that issue.
More info within the Jira ticket:
JIRA ticket: https://jira.ez.no/browse/EZP-30834
Thanks!