? .buildpath
? .project
? .settings
? 1002538.patch
? bootstrap.patch
? dump.sql
? favicon_error.patch
? sites/all/modules/devel
? sites/default/files
? sites/default/settings.php
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.328
diff -u -p -r1.328 system.admin.inc
--- modules/system/system.admin.inc	13 Jan 2011 01:08:28 -0000	1.328
+++ modules/system/system.admin.inc	13 Jan 2011 09:00:59 -0000
@@ -614,7 +614,7 @@ function system_theme_settings_validate(
     }
     else {
       // File upload failed.
-      form_set_error('logo_upload', t('The favicon could not be uploaded.'));
+      form_set_error('favicon_upload', t('The favicon could not be uploaded.'));
     }
   }