- Patch #902264 by Damien Tournoud: move hook_field_schema() to .install files so we can get the upgrade path to work.

2 files changed, 32 insertions, 32 deletions

diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index 38a24bde3..5ac4cfed3 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -32,38 +32,6 @@ function file_field_info() {
 }
 
 /**
- * Implements hook_field_schema().
- */
-function file_field_schema($field) {
-  return array(
-    'columns' => array(
-      'fid' => array(
-        'description' => 'The {files}.fid being referenced in this field.',
-        'type' => 'int',
-        'not null' => FALSE,
-        'unsigned' => TRUE,
-      ),
-      'display' => array(
-        'description' => 'Flag to control whether this file should be displayed when viewing content.',
-        'type' => 'int',
-        'size' => 'tiny',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 1,
-      ),
-      'description' => array(
-        'description' => 'A description of the file.',
-        'type' => 'text',
-        'not null' => FALSE,
-      ),
-    ),
-    'indexes' => array(
-      'fid' => array('fid'),
-    ),
-  );
-}
-
-/**
  * Implements hook_field_settings_form().
  */
 function file_field_settings_form($field, $instance, $has_data) {
diff --git a/modules/file/file.install b/modules/file/file.install
index c92068e98..fdf908805 100644
--- a/modules/file/file.install
+++ b/modules/file/file.install
@@ -7,6 +7,38 @@
  */
 
 /**
+ * Implements hook_field_schema().
+ */
+function file_field_schema($field) {
+  return array(
+    'columns' => array(
+      'fid' => array(
+        'description' => 'The {files}.fid being referenced in this field.',
+        'type' => 'int',
+        'not null' => FALSE,
+        'unsigned' => TRUE,
+      ),
+      'display' => array(
+        'description' => 'Flag to control whether this file should be displayed when viewing content.',
+        'type' => 'int',
+        'size' => 'tiny',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 1,
+      ),
+      'description' => array(
+        'description' => 'A description of the file.',
+        'type' => 'text',
+        'not null' => FALSE,
+      ),
+    ),
+    'indexes' => array(
+      'fid' => array('fid'),
+    ),
+  );
+}
+
+/**
  * Implements hook_requirements().
  *
  * Display information about getting upload progress bars working.