mirror of
https://github.com/nextcloud/server.git
synced 2026-06-11 09:42:09 -04:00
Fall back to black for non-color values
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
e339ed7f6e
commit
fdc532f753
2 changed files with 6 additions and 0 deletions
|
|
@ -111,6 +111,7 @@ class SvgController extends Controller {
|
|||
*
|
||||
* @param string $path
|
||||
* @param string $color
|
||||
* @param string $fileName
|
||||
* @return DataDisplayResponse|NotFoundResponse
|
||||
*/
|
||||
private function getSvg(string $path, string $color, string $fileName) {
|
||||
|
|
|
|||
|
|
@ -179,6 +179,11 @@ class IconsCacher {
|
|||
* @return string
|
||||
*/
|
||||
public function colorizeSvg($svg, $color): string {
|
||||
if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
|
||||
// Prevent not-sane colors from being written into the SVG
|
||||
$color = '000';
|
||||
}
|
||||
|
||||
// add fill (fill is not present on black elements)
|
||||
$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
|
||||
$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
|
||||
|
|
|
|||
Loading…
Reference in a new issue