From 44631f61be4b7a8e9b11f5d3d3c80bc209f38568 Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Sat, 18 Sep 2010 00:31:56 +0000
Subject: [PATCH] Fix fact that feeds_get_form() returns an array now.
---
feeds_ui/feeds_ui.admin.inc | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index 528c1162..c4c2219c 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -722,7 +722,7 @@ function theme_feeds_ui_edit_page($variables) {
* array(
* 'title' => 'the title',
* 'body' => 'the body of the container, may also be an array of more
- * containers.',
+ * containers or a renderable array.',
* 'class' => array('the class of the container.'),
* 'id' => 'the id of the container',
* );
@@ -751,8 +751,13 @@ function theme_feeds_ui_container($variables) {
if (!empty($container['body'])) {
$output .= '<div class="feeds-container-body">';
if (is_array($container['body'])) {
- foreach ($container['body'] as $c) {
- $output .= theme('feeds_ui_container', array('container' => $c));
+ if (isset($container['body']['#type'])) {
+ $output .= drupal_render($container['body']);
+ }
+ else {
+ foreach ($container['body'] as $c) {
+ $output .= theme('feeds_ui_container', array('container' => $c));
+ }
}
}
else {
--
GitLab