From 89250b08def27892875cd6cc2d770b048966b870 Mon Sep 17 00:00:00 2001
From: Nathan Haug <quicksketch@35821.no-reply.drupal.org>
Date: Mon, 20 Apr 2009 16:51:49 +0000
Subject: [PATCH] #436896: Maintain the "description" field value if updates are run multiple times or ImageField is updated first.

---
 filefield.install |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/filefield.install b/filefield.install
index e047371..77b25c5 100644
--- a/filefield.install
+++ b/filefield.install
@@ -202,13 +202,20 @@ function filefield_update_6100() {
   $fields = content_fields();
   foreach ($fields as $field) {
     if ($field['type'] == 'filefield') {
-      $field['list_field'] = empty($field['force_list_default']);
-      $field['description_field'] = $field['show_description'];
+      if (isset($field['force_list_default'])) {
+        $field['list_field'] = !$field['force_list_default'];
+      }
+      if (isset($field['show_description'])) {
+        $field['description_field'] = $field['show_description'];
+      }
       _content_field_write($field);
       $ret[] = array('success' => TRUE, 'query' => t('The File field %field has been updated with new settings.', array('%field' => $field['field_name'])));
     }
   }
 
+  cache_clear_all('*', content_cache_tablename(), TRUE);
+  cache_clear_all('*', 'cache', TRUE);
+
   return $ret;
 }
 
-- 
1.7.4.1