? 690828-block-ahah_0.patch
? 732542-system-goto-action-D7.patch
? 735528-states-or.patch
? 823428-entity-uri-34.patch
? 846296-file-download.patch
? 846296-file-download2.patch
? 890716-file-settings.patch
? file_download_access6.patch
? test.patch
? sites/default/files
? sites/default/private
Index: modules/file/file.field.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.field.inc,v
retrieving revision 1.31
diff -u -p -r1.31 file.field.inc
--- modules/file/file.field.inc	22 Aug 2010 13:52:58 -0000	1.31
+++ modules/file/file.field.inc	23 Aug 2010 11:42:15 -0000
@@ -17,7 +17,7 @@ function file_field_info() {
       'settings' => array(
         'display_field' => 0,
         'display_default' => 0,
-        'uri_scheme' => 'public',
+        'uri_scheme' => variable_get('file_default_scheme', 'public'),
       ),
       'instance_settings' => array(
         'file_extensions' => 'txt',
Index: modules/image/image.field.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.field.inc,v
retrieving revision 1.24
diff -u -p -r1.24 image.field.inc
--- modules/image/image.field.inc	22 Aug 2010 13:52:58 -0000	1.24
+++ modules/image/image.field.inc	23 Aug 2010 11:42:15 -0000
@@ -15,7 +15,7 @@ function image_field_info() {
       'label' => t('Image'),
       'description' => t('This field stores the ID of an image file as an integer value.'),
       'settings' => array(
-        'uri_scheme' => 'public',
+        'uri_scheme' => variable_get('file_default_scheme', 'public'),
         'default_image' => 0,
       ),
       'instance_settings' => array(