From b19513240766dea73ed6e71742ecdfaea69a8f8a Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Mon, 11 May 2015 17:30:59 +1200 Subject: [PATCH] Fix missing media parameter on Requirements::combine_files Regression from #4136 --- view/Requirements.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/view/Requirements.php b/view/Requirements.php index c87d72cb5..cc86cd077 100644 --- a/view/Requirements.php +++ b/view/Requirements.php @@ -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 */