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

[-] TR : #PSCSX-5938 Emails not copied into theme folder #3655

Merged
merged 1 commit into from Aug 28, 2015

Conversation

@maximebiloe
Copy link
Contributor

commented Aug 10, 2015

On PrestaShop Cloud, we were trying to copy emails into core folder and not into the shop theme folder because $dir is based on PS_MAIL_DIR based himself on PS_CORE_DIR

@@ -2682,7 +2682,7 @@ public function copyMailFilesForAllLanguages()
if (!in_array($file, self::$ignore_folder)) {
$files_to_copy_iso[] = array(
"from" => $dir.$file,
"to" => str_replace(_PS_ROOT_DIR_, _PS_ROOT_DIR_.'/themes/'.$current_theme, $dir).$file
"to" => str_replace((strpos($dir, _PS_CORE_DIR_) !== false) ? _PS_CORE_DIR_ : _PS_ROOT_DIR_, _PS_ROOT_DIR_.'/themes/'.$current_theme, $dir).$file

This comment has been minimized.

Copy link
@tchauviere

tchauviere Aug 14, 2015

Contributor

Can't we use PS_HOSTED_MODE instead of strpos with PS_CORE_DIR ?

This comment has been minimized.

Copy link
@maximebiloe

maximebiloe Aug 28, 2015

Author Contributor

Even if you use PS_HOSTED_MODE, you have to test for strpos with PS_CORE_DIR because if you didn't have modified your mail translations the files will be in PS_CORE_DIR but if you have modified them they will be in PS_ROOT_DIR.
So, I think PS_HOSTED_MODE will make the code more "heavy" for nothing.

This comment has been minimized.

Copy link
@tchauviere

tchauviere Aug 28, 2015

Contributor

👍

jnadaud pushed a commit that referenced this pull request Aug 28, 2015
[-] TR : #PSCSX-5938 Emails not copied into theme folder
@jnadaud jnadaud merged commit f18f5dc into PrestaShop:1.6.1.x Aug 28, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@maximebiloe maximebiloe deleted the maximebiloe:PSCSX-5938 branch May 20, 2016
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.