From 13837134da3fb6fb572384c9c1864da92c14bd1e Mon Sep 17 00:00:00 2001
From: Chris Leppanen <chris.leppanen@gmail.com>
Date: Thu, 19 Sep 2013 16:09:04 -0700
Subject: [PATCH] Issue #1984962 by mvd81NL, redsd, twistor: Fixed Use a 0 as
mapping source.
---
feeds_ui/feeds_ui.admin.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index beb19308..eb1ff636 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -718,7 +718,7 @@ function feeds_ui_mapping_settings_form_callback($form, $form_state) {
* Validation handler for feeds_ui_mapping_form().
*/
function feeds_ui_mapping_form_validate($form, &$form_state) {
- if (empty($form_state['values']['source']) xor empty($form_state['values']['target'])) {
+ if (!strlen($form_state['values']['source']) xor !strlen($form_state['values']['target'])) {
// Check triggering_element here so we can react differently for ajax
// submissions.
@@ -726,7 +726,7 @@ function feeds_ui_mapping_form_validate($form, &$form_state) {
// Regular form submission.
case 'op':
- if (empty($form_state['values']['source'])) {
+ if (!strlen($form_state['values']['source'])) {
form_error($form['source'], t('You must select a mapping source.'));
}
else {
@@ -790,7 +790,7 @@ function feeds_ui_mapping_form_submit($form, &$form_state) {
$processor->addConfig(array('mappings' => $mappings));
- if (!empty($form_state['values']['source']) && !empty($form_state['values']['target'])) {
+ if (strlen($form_state['values']['source']) && strlen($form_state['values']['target'])) {
try {
$mappings = $processor->getMappings();
$mappings[] = array(
--
GitLab