Skip to content
Snippets Groups Projects

2926312-improve-token-replacement: Reroll...

Open 2926312-improve-token-replacement: Reroll...
issue/filefield_paths-2926312:2926312-improve-token-replacement into 8.x-1.x
Open Chandansha Fakir requested to merge issue/filefield_paths-2926312:2926312-improve-token-replacement into 8.x-1.x
Compare
and
1 file
+ 3
− 3
Compare changes
  • Side-by-side
  • Inline
filefield_paths.tokens.inc
+ 3
− 3
@@ -45,18 +45,18 @@ function filefield_paths_tokens($type, $tokens, array $data, array $options, Bub
@@ -45,18 +45,18 @@ function filefield_paths_tokens($type, $tokens, array $data, array $options, Bub
switch ($name) {
switch ($name) {
case 'ffp-name-only':
case 'ffp-name-only':
$basename = $file_system->basename($file->filename->value);
$basename = $file_system->basename($file->filename->value);
$extension = preg_match('/\.[^.]+$/', $basename, $matches) ? $matches[0] : NULL;
$extension = preg_match('/\.[^.]*$/', $basename, $matches) ? $matches[0] : NULL;
$replacements[$original] = !is_null($extension) ? mb_substr($basename, 0, mb_strlen($basename) - mb_strlen($extension)) : $basename;
$replacements[$original] = !is_null($extension) ? mb_substr($basename, 0, mb_strlen($basename) - mb_strlen($extension)) : $basename;
break;
break;
case 'ffp-name-only-original':
case 'ffp-name-only-original':
$basename = $file_system->basename($file->origname->value);
$basename = $file_system->basename($file->origname->value);
$extension = preg_match('/\.[^.]+$/', $basename, $matches) ? $matches[0] : NULL;
$extension = preg_match('/\.[^.]*$/', $basename, $matches) ? $matches[0] : NULL;
$replacements[$original] = !is_null($extension) ? mb_substr($basename, 0, mb_strlen($basename) - mb_strlen($extension)) : $basename;
$replacements[$original] = !is_null($extension) ? mb_substr($basename, 0, mb_strlen($basename) - mb_strlen($extension)) : $basename;
break;
break;
case 'ffp-extension-original':
case 'ffp-extension-original':
$replacements[$original] = preg_match('/[^.]+$/', $file_system->basename($file->origname->value), $matches) ? $matches[0] : NULL;
$replacements[$original] = preg_match('/\.([^.]+)$/', $file_system->basename($file->origname->value), $matches) ? $matches[1] : NULL;
break;
break;
}
}
}
}