Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/editview/CHANGELOG.txt,v
retrieving revision 1.1
diff -u -p -r1.1 CHANGELOG.txt
--- CHANGELOG.txt	17 Feb 2009 00:39:01 -0000	1.1
+++ CHANGELOG.txt	11 Mar 2009 19:52:52 -0000
@@ -1,12 +1,13 @@
 $Id: CHANGELOG.txt,v 1.1 2009/02/17 00:39:01 agileware Exp $
 
-Editview x.x-x.x, xxx-xx-xx
----------------------------
-by Darren Oh: Updated to Drupal 6 and Views 2.
+Editview x.x-x.x, xxxx-xx-xx
+----------------------------
 
 
-Editview 5.x-1.x, xxxx-xx-xx
+Editview 6.x-1.x, xxxx-xx-xx
 ----------------------------
+#367744 by Darren Oh: Updated to Drupal 6 and Views 2.
+#396172 by Darren Oh: Fixed error notices.
 
 
 Editview 5.x-1.0, 2009-01-29
Index: theme/editview.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/editview/theme/editview.theme.inc,v
retrieving revision 1.1
diff -u -p -r1.1 editview.theme.inc
--- theme/editview.theme.inc	17 Feb 2009 00:39:02 -0000	1.1
+++ theme/editview.theme.inc	11 Mar 2009 19:52:52 -0000
@@ -99,13 +99,12 @@ function editview_field_form_render(&$fo
   $element = array('class' => 'editview-field', 'valign' => 'top');
   switch ($field->field_alias) {
     default:
-      $vocab_id = str_replace('term_node_', '', $field->table_alias);
-      if (is_numeric($vocab_id)) {
+      if (isset($field->table_alias) && is_numeric($vocab_id = str_replace('term_node_', '', $field->table_alias))) {
         $element['data'] = drupal_render($form['taxonomy'][$vocab_id]);
       }
       else {
-        // If the field is a cck field, send throught the right identifier.
-        if ($field->content_field['field_name']) {
+        // If the field is a cck field, send through the right identifier.
+        if (isset($field->content_field)) {
           $element['data'] = _editview_form_field($form, $field->content_field['field_name']);
         }
         else {
@@ -142,7 +141,7 @@ function _editview_form_field(&$elements
       default:
         // @TODO: Change this method of stopping the drag and drop functionality
         //        on tables so it isn't a dirty hack.
-        if ($elements[$field]['#theme'] == 'content_multiple_values') {
+        if (isset($elements[$field]['#theme']) && $elements[$field]['#theme'] == 'content_multiple_values') {
           $table_id = ' id="' . $elements[$field]['#field_name'] . '_values"';
           $render = drupal_render($elements[$field]);
           $render = str_replace($table_id, '', $render);