From 7c2837dfc46c1be9f9309f5ed6e40613533e212e Wed, 3 Jul 2013 22:35:10 +0200
From: hass <hass@85918.no-reply.drupal.org>
Date: Wed, 3 Jul 2013 22:34:48 +0200
Subject: [PATCH] Issue #2033885 by hass: Redirection location inline textfield should not be wrapped in normal form wrappers

diff --git a/includes/webform.pages.inc b/includes/webform.pages.inc
index 97c9395..ce83892 100644
--- a/includes/webform.pages.inc
+++ b/includes/webform.pages.inc
@@ -71,9 +71,10 @@
     '#default_value' => $redirect,
     '#options' => array(
       'confirmation' => t('Confirmation page'),
-      'url' => t('Custom URL'),
+      'url' => t('Custom URL: !redirect_url'),
       'none' => t('No redirect (reload current page)'),
     ),
+    '#parents' => array('redirect'),
   );
   $form['submission']['redirection']['redirect_url'] = array(
     '#type' => 'textfield',
@@ -81,6 +82,7 @@
     '#description' => t('URL to redirect the user to upon successful submission.'),
     '#default_value' => $redirect_url,
     '#maxlength' => 255,
+    '#parents' => array('redirect_url'),
   );
 
   // Submission limit settings for all submissions.
@@ -356,16 +358,17 @@
   $form = $variables['form'];
   // Add special class for setting the active radio button.
   $form['redirect_url']['#attributes']['class'] = array('webform-set-active');
+  $form['redirect_url']['#theme_wrappers'] = array();
 
   // Remove title and description for Redirect URL field.
   $form['redirect_url']['#title'] = NULL;
   $form['redirect_url']['#description'] = NULL;
 
   $form['redirect']['confirmation']['#theme_wrappers'] = array('webform_inline_radio');
+  $form['redirect']['url']['#title'] = NULL;
+  $form['redirect']['url']['#inline_element'] = t('Custom URL: !redirect_url', array('!redirect_url' => drupal_render($form['redirect_url'])));
   $form['redirect']['url']['#theme_wrappers'] = array('webform_inline_radio');
   $form['redirect']['none']['#theme_wrappers'] = array('webform_inline_radio');
-  $form['redirect']['url']['#inline_element'] = $form['redirect']['url']['#title'] . ': ' . drupal_render($form['redirect_url']);
-  $form['redirect']['url']['#title'] = NULL;
 
   return drupal_render_children($form);
 }