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.

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

Fixed invalid path to PEAR in Archive_Tar library #5602

Merged

Conversation

@mickaelandrieu
Copy link
Member

commented May 20, 2016

Questions Answers
Branch? develop
Description? Since update of Archive_Tar, the path to PEAR library needs to be updated.
Type? bug fix
Category? CO
BC breaks? no
Deprecations? no
How to test? Try to install a module that require PEAR like ps_compliance ... wow, it works !

Important guidelines

@mickaelandrieu mickaelandrieu changed the title CO: fixed invalid path to PEAR library Updated path to PEAR library May 20, 2016

@mickaelandrieu mickaelandrieu changed the title Updated path to PEAR library CO: fixed invalid path to PEAR in Archive_Tar library May 20, 2016

@Shudrum

View changes

tools/tar/Archive_Tar.php Outdated
@@ -42,7 +42,7 @@
// If the PEAR class cannot be loaded via the autoloader,
// then try to require_once it from the PHP include path.
if (!class_exists('PEAR')) {
require_once 'PEAR.php';
require_once(dirname(__FILE__).'/../pear/PEAR.php');

This comment has been minimized.

Copy link
@Shudrum

Shudrum May 20, 2016

Contributor

Now we can use __DIR__ as we are on PHP 5.4 😃

@mickaelandrieu mickaelandrieu force-pushed the mickaelandrieu:fixed-invalid-path-to-pear branch to 04d0de9 May 20, 2016

@mickaelandrieu mickaelandrieu changed the title CO: fixed invalid path to PEAR in Archive_Tar library Fixed invalid path to PEAR in Archive_Tar library May 20, 2016

@Shudrum Shudrum merged commit 7dd2467 into PrestaShop:develop May 20, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mickaelandrieu mickaelandrieu deleted the mickaelandrieu:fixed-invalid-path-to-pear branch May 20, 2016

@mickaelandrieu

This comment has been minimized.

Copy link
Member Author

commented May 20, 2016

thank you for review @Shudrum !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.