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

BUG Fix folder urls getting mtime querystring appended

Browse Source
This commit is contained in:
Damian Mooyman 2017-06-28 16:59:41 +12:00
parent 741166e369
commit 8078ee08f2
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Control/SimpleResourceURLGenerator.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\Control; namespace SilverStripe\Control;
use InvalidArgumentException;
use SilverStripe\Core\Manifest\ResourceURLGenerator; use SilverStripe\Core\Manifest\ResourceURLGenerator;
/** /**
@ -30,6 +31,7 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator
* Currently only "mtime" is allowed * Currently only "mtime" is allowed
* *
* @param string|null $nonceStyle The style of nonces to apply, or null to disable * @param string|null $nonceStyle The style of nonces to apply, or null to disable
* @return $this
*/ */
public function setNonceStyle($nonceStyle) public function setNonceStyle($nonceStyle)
{ {
@ -37,6 +39,7 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator
throw new InvalidArgumentException('The only allowed NonceStyle is mtime'); throw new InvalidArgumentException('The only allowed NonceStyle is mtime');
} }
$this->nonceStyle = $nonceStyle; $this->nonceStyle = $nonceStyle;
return $this;
} }
/** /**
@ -55,7 +58,8 @@ class SimpleResourceURLGenerator implements ResourceURLGenerator
} }
$nonce = ''; $nonce = '';
if ($this->nonceStyle) { // Don't add nonce to directories
if ($this->nonceStyle && is_file($absolutePath)) {
$nonce = (strpos($relativePath, '?') === false) ? '?' : '&'; $nonce = (strpos($relativePath, '?') === false) ? '?' : '&';
switch ($this->nonceStyle) { switch ($this->nonceStyle) {