? .cvsignore
? browser
? media-popup.patch
? media.interpolateUrl.patch
? images/icons/tango
? images/icons/tango-icon-theme-0.8.90.tar.gz
? test/media.filter.test
? test/media.testlib.inc
Index: media.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.admin.inc,v
retrieving revision 1.32
diff -u -r1.32 media.admin.inc
--- media.admin.inc	16 Feb 2011 21:52:16 -0000	1.32
+++ media.admin.inc	16 Feb 2011 22:11:42 -0000
@@ -573,9 +573,10 @@
  */
 function media_admin_config_browser($form, &$form_state) {
   $theme_options = array();
+  $theme_options[NULL] = 'Default administration theme';
   foreach (list_themes() as $key => $theme) {
     if ($theme->status) {
-      $theme_options[] = $key;
+      $theme_options[$key] = $theme->info['name'];
     }
   }
 
@@ -595,4 +596,11 @@
   );
 
   return system_settings_form($form);
-}
\ No newline at end of file
+}
+
+function media_admin_config_browser_validate(&$form, &$form_state) {
+  if (!$form_state['values'][media_variable_name('dialog_theme')]) {
+    media_variable_del('dialog_theme');
+    unset($form_state['values'][media_variable_name('dialog_theme')]);
+  }
+}
Index: media.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.module,v
retrieving revision 1.73
diff -u -r1.73 media.module
--- media.module	16 Feb 2011 21:37:21 -0000	1.73
+++ media.module	16 Feb 2011 22:11:43 -0000
@@ -796,8 +796,7 @@
  * @return string
  */
 function media_dialog_get_theme_name() {
-  // Set to empty to get the default theme.
-  return media_variable_get('dialog_theme');
+  return media_variable_get('dialog_theme', variable_get('admin_theme'));
 }
 
 /**
Index: includes/media.variables.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/includes/media.variables.inc,v
retrieving revision 1.14
diff -u -r1.14 media.variables.inc
--- includes/media.variables.inc	16 Feb 2011 21:37:21 -0000	1.14
+++ includes/media.variables.inc	16 Feb 2011 22:11:43 -0000
@@ -127,8 +127,8 @@
       'field_select_media_text' => 'Select media',
       'field_remove_media_text' => 'Remove media',
 
-      // Name of the theme to use in media popup dialogs
-      'dialog_theme' => 'seven',
+      // Name of the theme to use in media popup dialogs, defaults to admin_theme
+      'dialog_theme' => '',
       // @TODO: Make a configuration form with this.
       'file_extensions' => 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp mp3 mov m4v mp4 mpeg avi ogg wmv ico',
       'max_filesize' => '',