contrib modules security updates

This commit is contained in:
Bachir Soussi Chiadmi
2016-10-13 12:10:40 +02:00
parent ffd758abc9
commit 747127f643
732 changed files with 67976 additions and 23207 deletions

View File

@@ -6,15 +6,12 @@
*/
/**
* Implements hook_feeds_processor_targets_alter().
*
* @see FeedsProcessor::getMappingTargets()
* Implements hook_feeds_processor_targets().
*/
function number_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_name) {
function number_feeds_processor_targets($entity_type, $bundle_name) {
$targets = array();
$numeric_types = array(
'list_integer',
'list_float',
'list_boolean',
'number_integer',
'number_decimal',
'number_float',
@@ -30,43 +27,27 @@ function number_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_n
);
}
}
return $targets;
}
/**
* Callback for mapping numerics.
*
* Ensure that $value is a numeric to avoid database errors.
* Callback for mapping number fields.
*/
function number_feeds_set_target($source, $entity, $target, $value) {
// Do not perform the regular empty() check here. 0 is a valid value. That's
// really just a performance thing anyway.
if (!is_array($value)) {
$value = array($value);
}
$info = field_info_field($target);
function number_feeds_set_target(FeedsSource $source, $entity, $target, array $values, array $mapping) {
$language = $mapping['language'];
// Iterate over all values.
$field = isset($entity->$target) ? $entity->$target : array('und' => array());
$field = isset($entity->$target) ? $entity->$target : array($language => array());
// Allow for multiple mappings to the same target.
$delta = count($field['und']);
foreach ($values as $value) {
foreach ($value as $v) {
if ($info['cardinality'] == $delta) {
break;
if (is_object($value) && ($value instanceof FeedsElement)) {
$value = $value->getValue();
}
if (is_object($v) && ($v instanceof FeedsElement)) {
$v = $v->getValue();
}
if (is_numeric($v)) {
$field['und'][$delta]['value'] = $v;
$delta++;
if (is_numeric($value)) {
$field[$language][] = array('value' => $value);
}
}