Index: image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.module,v
retrieving revision 1.197.2.6
diff -u -r1.197.2.6 image.module
--- image.module	1 Mar 2007 04:05:48 -0000	1.197.2.6
+++ image.module	23 Jul 2007 16:45:41 -0000
@@ -81,13 +81,13 @@
   $form['#tree'] = TRUE;
   $form['#theme'] = 'image_settings_sizes_form';
   for ($i = 0; $i < 5; $i++) {
-    $form[$i]['label'] = array('#type' => 'textfield', '#default_value' => $sizes[$i]['label'], '#size' => 25);
-    if (in_array($sizes[$i]['label'], _image_required_sizes())) {
+    $form[$i]['label'] = array('#type' => 'textfield', '#default_value' => isset($sizes[$i]['label']) ? $sizes[$i]['label'] : NULL, '#size' => 25);
+    if (!empty($sizes[$i]['label']) && in_array($sizes[$i]['label'], _image_required_sizes())) {
       $form[$i]['label']['#attributes'] = array('disabled' => 'disabled');
       $form[$i]['label']['#value'] = $sizes[$i]['label'];
     }
-    $form[$i]['width'] = array('#type' => 'textfield', '#default_value' => $sizes[$i]['width'], '#size' => 5, '#maxlength' => 5);
-    $form[$i]['height'] = array('#type' => 'textfield', '#default_value' => $sizes[$i]['height'], '#size' => 5, '#maxlength' => 5);
+    $form[$i]['width'] = array('#type' => 'textfield', '#default_value' => isset($sizes[$i]['width']) ? $sizes[$i]['width'] : NULL, '#size' => 5, '#maxlength' => 5);
+    $form[$i]['height'] = array('#type' => 'textfield', '#default_value' => isset($sizes[$i]['height']) ? $sizes[$i]['height'] : NULL, '#size' => 5, '#maxlength' => 5);
   }
 
   return $form;
@@ -231,9 +231,8 @@
 function image_form_add_thumbnail($form_id, $edit) {
   if ($edit['images']['thumbnail']) {
     $node = (object)($edit);
-    $form = array('#type' => 'item', '#title' => t('Thumbnail'), '#value' => image_display($node, 'thumbnail'), '#weight' => -10);
+    return array('#type' => 'item', '#title' => t('Thumbnail'), '#value' => image_display($node, 'thumbnail'), '#weight' => -10);
   }
-  return $form;
 }
 
 /**
@@ -243,30 +242,30 @@
   _image_check_settings();
 
   $form['#attributes'] = array("enctype" => "multipart/form-data");
-  $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#size' => 60, '#maxlength' => 128, '#required' => TRUE, '#default_value' => $node->title);
+  $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#size' => 60, '#maxlength' => 128, '#required' => TRUE, '#default_value' => isset($node->title) ? $node->title : NULL);
 
   $sizes = _image_get_sizes();
   $form['images']['#tree'] = TRUE;
-  if ($node->new_file) {
+  if (!empty($node->new_file)) {
     $form['images']['_original'] = array('#type' => 'hidden', '#value' => $node->images['_original']);
   }
   else {
-    $form['images']['_original'] = array('#type' => 'hidden', '#default_value' => $node->images['_original']);
+    $form['images']['_original'] = array('#type' => 'hidden', '#default_value' => isset($node->images['_original']) ? $node->images['_original'] : NULL);
   }
   foreach ($sizes as $size) {
-    if ($node->new_file) {
+    if (!empty($node->new_file)) {
       $form['images'][$size['label']] = array('#type' => 'hidden', '#value' => $node->images[$size['label']]);
     }
     else {
-      $form['images'][$size['label']] = array('#type' => 'hidden', '#default_value' => $node->images[$size['label']]);
+      $form['images'][$size['label']] = array('#type' => 'hidden', '#default_value' => isset($node->images[$size['label']]) ? $node->images[$size['label']] : NULL);
     }
   }
 
   $form['thumbnail']['#after_build'] = array('image_form_add_thumbnail');
   
   $form['image'] = array('#type' => 'file', '#title' => t('Image'), '#description' => t('Click "Browse..." to select an image to upload.'), '#weight' => -3);
-  $form['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#rows' => 20, '#default_value' => $node->body);
-  $form['format'] = filter_form($node->format);
+  $form['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#rows' => 20, '#default_value' => isset($node->body) ? $node->body : NULL);
+  $form['format'] = filter_form(isset($node->format) ? $node->format : NULL);
 
   return $form;
 }
@@ -275,7 +274,7 @@
  * Implementation of hook_view
  */
 function image_view(&$node, $teaser = 0, $page = 0) {
-  $request = ($_GET['size']) ? $_GET['size'] : 'preview';
+  $request = !empty($_GET['size']) ? $_GET['size'] : 'preview';
   $request = check_plain($request);
   $node = node_prepare($node, $teaser);
   $node->teaser = theme('image_teaser', $node);