From 176b5d6f4319d0c42667442f5907d3cbbcd9987b Mon Sep 17 00:00:00 2001
From: mrded <mrded@556088.no-reply.drupal.org>
Date: Tue, 1 Jul 2014 14:12:02 +0100
Subject: [PATCH] Checkbox and radio inputs are rendered outside their labels

---
 theme/system/form-element.func.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/system/form-element.func.php b/theme/system/form-element.func.php
index f52d98b..2a88eb5 100644
--- a/theme/system/form-element.func.php
+++ b/theme/system/form-element.func.php
@@ -113,10 +113,10 @@ function bootstrap_form_element(&$variables) {
 
     case 'after':
       if ($is_radio || $is_checkbox) {
-        $output .= ' ' . $prefix . $element['#children'] . $suffix;
+        $variables['#children'] = $prefix . $element['#children'] . ' ' . $suffix;
       }
       else {
-        $variables['#children'] = ' ' . $prefix . $element['#children'] . $suffix;
+        $output .= ' ' . $prefix . $element['#children'] . $suffix;
       }
       $output .= ' ' . theme('form_element_label', $variables) . "\n";
       break;
-- 
1.8.5.2 (Apple Git-48)

