Skip to content

Commit

Permalink
[BUGFIX] Have ResourceCompressor calculate relative paths
Browse files Browse the repository at this point in the history
Follow-up fix for TYPO3 8.x.

See TYPO3/typo3@5ee15e4
  • Loading branch information
fnagel committed Sep 11, 2017
1 parent 00be909 commit 2e06b76
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Classes/Resource/ResourceCompressor.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* (c) 2010-2011 Steffen Gebert <steffen@steffen-gebert.de>
* (c) 2011 Kai Vogel <kai.vogel@speedprogs.de>
* (c) 2013-2016 Felix Nagel <info@felixnagel.com>
* (c) 2013-2017 Felix Nagel <info@felixnagel.com>
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
Expand Down Expand Up @@ -81,7 +81,11 @@ public function compressJsFile($filename)
$this->writeFileAndCompressed($targetFile, $minifiedContents);
}

return $this->relativePath.$this->returnFileReference($targetFile);
if (version_compare(TYPO3_branch, '8.0', '>=')) {
return $this->returnFileReference($targetFile);
} else {
return $this->relativePath.$this->returnFileReference($targetFile);
}
}

/**
Expand Down

0 comments on commit 2e06b76

Please sign in to comment.