[gh-306] Merging trunk into test -c1490

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/testing@1491 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/unl/unl.module

@@ -279,7 +279,9 @@ function unl_filter_process_format($element) {
   // Only remove the plain_text and filtered_html options on the node edit form. They need to be available on comment forms, etc.
   if ($element['#entity_type'] == 'node') {
     unset($element['format']['format']['#options']['plain_text']);
+    unset($element['format']['format']['#options'][1]); // On production the machine names are integers
     unset($element['format']['format']['#options']['filtered_html']);
+    unset($element['format']['format']['#options'][11]);
     $element['format']['format']['#title'] = 'Editor: ';
   }
   return $element;