From 48c59042c0d8a000cf0ceb778174e74c773f17df Mon Sep 17 00:00:00 2001
From: Randal Scott Kelly <rskdaegon@gmail.com>
Date: Fri, 17 Jun 2011 10:55:56 +1000
Subject: [PATCH] 1170536 Undefined variable: link_types in mediaelement_field_formatter_settings_form()

---
 mediaelement.module |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mediaelement.module b/mediaelement.module
index e3083be..e89ee58 100644
--- a/mediaelement.module
+++ b/mediaelement.module
@@ -190,38 +190,37 @@ function mediaelement_field_formatter_settings_form($field, $instance, $view_mod
   $display = $instance['display'][$view_mode];
   $settings = $display['settings'];
 
-  $form['controls'] = array(
+  $element['controls'] = array(
     '#title' => t('Controls'),
     '#type' => 'checkbox',
     '#default_value' => $settings['controls'],
   );
 
-  $form['width'] = array(
+  $element['width'] = array(
     '#title' => t('Width'),
     '#type' => 'textfield',
     '#default_value' => $settings['width'],
-    '#options' => $link_types,
   );
 
-  $form['height'] = array(
+  $element['height'] = array(
     '#title' => t('Height'),
     '#type' => 'textfield',
     '#default_value' => $settings['height'],
   );
 
-  $form['download_link'] = array(
+  $element['download_link'] = array(
     '#title' => t('Download Link'),
     '#type' => 'checkbox',
     '#default_value' => $settings['download_link'],
   );
 
-  $form['download_text'] = array(
+  $element['download_text'] = array(
     '#title' => t('Download Link Text'),
     '#type' => 'textfield',
     '#default_value' => $settings['download_text'],
   );
 
-  return $form;
+  return $element;
 }
 
 /**
-- 
1.7.0.4