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

Fix missing media parameter on Requirements::combine_files

Browse Source 
Regression from #4136
This commit is contained in:
Damian Mooyman 2015-05-11 17:30:59 +12:00
parent 85c51167c0
commit b195132407
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/Requirements.php
View File

@ -311,11 +311,12 @@ class Requirements implements Flushable {
* *
* @param string $combinedFileName Filename of the combined file relative to docroot * @param string $combinedFileName Filename of the combined file relative to docroot
* @param array $files Array of filenames relative to docroot * @param array $files Array of filenames relative to docroot
* @param string $media
* *
* @return bool|void * @return bool|void
*/ */
public static function combine_files($combinedFileName, $files) { public static function combine_files($combinedFileName, $files, $media = null) {
self::backend()->combine_files($combinedFileName, $files); self::backend()->combine_files($combinedFileName, $files, $media);
} }
/** /**
@ -1034,6 +1035,7 @@ class Requirements_Backend {
* *
* @param string $combinedFileName Filename of the combined file relative to docroot * @param string $combinedFileName Filename of the combined file relative to docroot
* @param array $files Array of filenames relative to docroot * @param array $files Array of filenames relative to docroot
* @param string $media
* *
* @return bool|void * @return bool|void
*/ */