From 0536ad31ce577e96290975ff07773378aa31c395 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will.rossiter@gmail.com>
Date: Tue, 7 May 2013 22:22:41 +1200
Subject: [PATCH] FIX: Ensure available widgets list is consistent between
 versions (#6292)

---
 code/form/WidgetAreaEditor.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/form/WidgetAreaEditor.php b/code/form/WidgetAreaEditor.php
index 8977e87..0623f28 100644
--- a/code/form/WidgetAreaEditor.php
+++ b/code/form/WidgetAreaEditor.php
@@ -42,10 +42,13 @@ class WidgetAreaEditor extends FormField {
 		foreach($this->widgetClasses as $widgetClass) {
 			$classes = ClassInfo::subclassesFor($widgetClass);
 
-			if(count($classes) > 1) {
-				array_shift($classes);
+			if (isset($classes['Widget'])) { 
+				unset($classes['Widget']); 
+			} 
+			else if (isset($classes[0]) && $classes[0] == 'Widget') { 
+				unset($classes[0]); 
 			}
-
+			
 			foreach($classes as $class) {
 				$widgets->push(singleton($class));
 			}