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

Do not load index.php file in catalogue #7407

Merged
merged 1 commit into from Jan 26, 2017

Conversation

@maximebiloe
Copy link
Contributor

commented Jan 26, 2017

Questions Answers
Branch? 1.7.0.x
Description? Do not load index.php file in catalogue
Type? bug fix
Category? CO
BC breaks? no
Deprecations? no
Fixed ticket? http://forge.prestashop.com/browse/BOOM-2283 (partially) Need a fix on TranlationToolsBundle too (PrestaShop/TranslationToolsBundle#28)
How to test?

@maximebiloe maximebiloe added this to the 1.7.0.5 milestone Jan 26, 2017

@aleeks

This comment has been minimized.

Copy link
Contributor

commented Jan 26, 2017

Thank you @maximebiloe

@aleeks aleeks merged commit ead7870 into PrestaShop:1.7.0.x Jan 26, 2017

1 check passed

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

@aleeks aleeks deleted the maximebiloe:translation-finder branch Jan 26, 2017

@@ -54,6 +54,10 @@ public function getCatalogueFromPaths($paths, $locale, $pattern = null)
}
foreach ($translationFiles as $file) {
if ('index.php' === $file->getFileName()) {

This comment has been minimized.

Copy link
@Quetzacoalt91

Quetzacoalt91 Jan 26, 2017

Member

Did you know that you could directly exclude this files from the finder execution ?

http://symfony.com/doc/current/components/finder.html#file-name

You could have written

$translationFiles = $finder->files()->notName('index.php')->in($paths);

This comment has been minimized.

Copy link
@maximebiloe

maximebiloe Jan 26, 2017

Author Contributor

Arf 🤕 I didn't know.

This comment has been minimized.

Copy link
@Quetzacoalt91

Quetzacoalt91 Jan 26, 2017

Member

Refacto time ! 😬

This comment has been minimized.

Copy link
@maximebiloe

maximebiloe Jan 27, 2017

Author Contributor

Here it is @Quetzacoalt91 #7411

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