Index: media.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.module,v
retrieving revision 1.73
diff -u -p -r1.73 media.module
--- media.module	16 Feb 2011 21:37:21 -0000	1.73
+++ media.module	23 Feb 2011 21:15:46 -0000
@@ -1129,10 +1129,16 @@ function media_element_validate(&$elemen
 function media_filter_info() {
   $filters['media_filter'] = array(
     'title' => t('Converts Media tags to Markup'),
-    'description' => t('This filter will convert [[{type:media... ]] tags into markup'),
+    'description' => t('This filter will convert [[{type:media... ]] tags into markup.'),
     'process callback' => 'media_filter',
     'tips callback' => 'media_filter_tips', // @TODO not implemented
   );
+
+  // If the WYSIWYG module is enabled, add additional help.
+  if (module_exists('wysiwyg')) {
+    $filters['media_filter']['description'] .= ' ' . t('This must be enabled for the WYSIWYG integration to work correctly with this text filter.');
+  }
+
   return $filters;
 }