Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-5709-airtime-analyzer' into saas-file-sanitization

Browse source 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
Albert Santoni 2015-02-18 17:18:43 -05:00
commit 9098e204e5
3 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/application/controllers/LibraryController.php
View file

@ -441,12 +441,11 @@ class LibraryController extends Zend_Controller_Action
$serialized[$j["name"]] = $j["value"];
}
if ($form->isValid($serialized)) {
// Sanitize any incorrect metadata that slipped past validation
FileDataHelper::sanitizeData($serialized);
$file->setDbColMetadata($serialized);
// Sanitize any wildly incorrect metadata before it goes to be validated.
FileDataHelper::sanitizeData($serialized);
$this->_redirect('Library');
if ($form->isValid($serialized)) {
$file->setDbColMetadata($serialized);
}
}