From 5e4a82962511c4329e94adbd2aa5ba3f6c8fa9e2 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 20 Mar 2017 13:32:03 -0600 Subject: [PATCH] Make filenames more windows-friendly to avoid issues --- CHANGELOG.md | 2 ++ classes/gpm.php | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 430c94c2..8d511c8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ 1. [](#new) * Improved `range` form field with touch and counter support [#1016](https://github.com/getgrav/grav-plugin-admin/pull/1016) +1. [](#bugfix) + * Cleanup package files via GPM install to make them more windows-friendly [#1361](https://github.com/getgrav/grav/pull/1361) # v1.3.0-rc.2 ## 03/17/2017 diff --git a/classes/gpm.php b/classes/gpm.php index 8fd22f0f..dcf7c89d 100644 --- a/classes/gpm.php +++ b/classes/gpm.php @@ -302,6 +302,7 @@ class Gpm $bad_chars = array_merge(array_map('chr', range(0, 31)), ["<", ">", ":", '"', "/", "\\", "|", "?", "*"]); $filename = $package->slug . str_replace($bad_chars, "", basename($package->zipball_url)); + $filename = preg_replace('/[\\\\\/:"*?&<>|]+/mi', '-', $filename); file_put_contents($tmp_dir . DS . $filename . '.zip', $contents);