- Patch #862352 by chx: fields without columns throw notices.

1 files changed, 16 insertions, 15 deletions

diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module
index bf9d0d663..8c1fe9ad5 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.module
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -677,20 +677,21 @@ function field_sql_storage_field_storage_purge_field($field) {
  */
 function field_sql_storage_field_storage_details($field) {
   $details = array();
-
-  // Add field columns.
-  foreach ((array) $field['columns'] as $column_name => $attributes) {
-    $real_name = _field_sql_storage_columnname($field['field_name'], $column_name);
-    $columns[$column_name] = $real_name;
-  }
-  return array(
-    'sql' => array(
-      FIELD_LOAD_CURRENT => array(
-        _field_sql_storage_tablename($field) => $columns,
-      ),
-      FIELD_LOAD_REVISION => array(
-        _field_sql_storage_revision_tablename($field) => $columns,
+  if (!empty($field['columns'])) {
+     // Add field columns.
+    foreach ($field['columns'] as $column_name => $attributes) {
+      $real_name = _field_sql_storage_columnname($field['field_name'], $column_name);
+      $columns[$column_name] = $real_name;
+    }
+    return array(
+      'sql' => array(
+        FIELD_LOAD_CURRENT => array(
+          _field_sql_storage_tablename($field) => $columns,
+        ),
+        FIELD_LOAD_REVISION => array(
+          _field_sql_storage_revision_tablename($field) => $columns,
+        ),
       ),
-    ),
-  );
+    );
+  }
 }