tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1041 from chrometoasters/pulls/1039-email-template-path-win-fix

Browse Source 
Use correct directory separator on Windows when selecting email templates
This commit is contained in:
Steve Boyd 2021-02-21 21:50:33 +13:00 committed by GitHub
commit 75fe398be5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Model/Recipient/EmailRecipient.php
View File

@ -521,8 +521,8 @@ class EmailRecipient extends DataObject
} }
$templatePath = substr($absoluteFilename, strlen($prefixToStrip) + 1); $templatePath = substr($absoluteFilename, strlen($prefixToStrip) + 1);
// Optionally remove "templates/" prefixes // Optionally remove "templates/" ("templates\" on Windows respectively) prefixes
if (preg_match('/(?<=templates\/).*$/', $templatePath, $matches)) { if (preg_match('#(?<=templates' . DIRECTORY_SEPARATOR . ').*$#', $templatePath, $matches)) {
$templatePath = $matches[0]; $templatePath = $matches[0];
} }