From 9e89fdfe43b9c08b4d01a5ee7f16e16b754dd1d7 Mon Sep 17 00:00:00 2001
From: franz <franz@581844.no-reply.drupal.org>
Date: Wed, 22 Aug 2012 13:42:41 +0200
Subject: [PATCH] Issue #1110762 by vaartio, franz, bancarddata, axel.rutz:
Fixed Feeds does not catch file exceptions properly in file mapper and
FeedsParser.inc getFile() function.
---
mappers/file.inc | 8 +++++++-
plugins/FeedsParser.inc | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/mappers/file.inc b/mappers/file.inc
index ce777ad5..2cc5dc3a 100644
--- a/mappers/file.inc
+++ b/mappers/file.inc
@@ -75,7 +75,13 @@ function file_feeds_set_target($source, $entity, $target, $value) {
$i = 0;
$field = isset($entity->$target) ? $entity->$target : array();
foreach ($value as $v) {
- if ($file = $v->getFile($destination)) {
+ try {
+ $file = $v->getFile($destination);
+ }
+ catch (Exception $e) {
+ watchdog_exception('Feeds', $e, nl2br(check_plain($e)));
+ }
+ if ($file) {
$field['und'][$i] = (array)$file;
$field['und'][$i]['display'] = 1; // @todo: Figure out how to properly populate this field.
if ($info['cardinality'] == 1) {
diff --git a/plugins/FeedsParser.inc b/plugins/FeedsParser.inc
index 7d1004f2..5cdac88f 100644
--- a/plugins/FeedsParser.inc
+++ b/plugins/FeedsParser.inc
@@ -368,7 +368,12 @@ class FeedsEnclosure extends FeedsElement {
if (file_uri_target($destination)) {
$destination = trim($destination, '/') . '/';
}
- $file = file_save_data($this->getContent(), $destination . $filename);
+ try {
+ $file = file_save_data($this->getContent(), $destination . $filename);
+ }
+ catch (Exception $e) {
+ watchdog_exception('Feeds', $e, nl2br(check_plain($e)));
+ }
}
// We couldn't make sense of this enclosure, throw an exception.
--
GitLab