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

Merge pull request #4176 from tractorcow/pulls/3.1/fix-combine-media

Browse Source 
Fix missing media parameter on Requirements::combine_files
This commit is contained in:
Ingo Schommer 2015-05-11 17:36:44 +12:00
commit 2ea8dd86e1
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 array $files Array of filenames relative to docroot
* @param string $media
*
* @return bool|void
*/
public static function combine_files($combinedFileName, $files) {
self::backend()->combine_files($combinedFileName, $files);
public static function combine_files($combinedFileName, $files, $media = null) {
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 array $files Array of filenames relative to docroot
* @param string $media
*
* @return bool|void
*/