Merge branch '4.0'

This commit is contained in:
Benoît Burnichon
2016-03-04 18:11:51 +01:00
3 changed files with 29 additions and 9 deletions

View File

@@ -406,12 +406,12 @@ class ToolsController extends Controller
}
/**
* @param $record
* @param $subDefName
* @param $subDefDataUri
* @param \record_adapter $record
* @param string $subDefName
* @param string $subDefDataUri
* @throws \DataURI\Exception\InvalidDataException
*/
private function substituteMedia($record, $subDefName, $subDefDataUri)
private function substituteMedia(\record_adapter $record, $subDefName, $subDefDataUri)
{
$dataUri = Parser::parse($subDefDataUri);