*** CMS_orig.pm	Wed Dec  3 11:53:30 2003
--- CMS.pm	Wed Dec  3 12:01:36 2003
***************
*** 13,16 ****
--- 13,17 ----
  use MT::App;
  @MT::App::CMS::ISA = qw( MT::App );
+ use ExtraFields;
  
  sub init {
***************
*** 499,502 ****
--- 500,506 ----
                      $param{previous_entry_id} = $prev->id;
                  }
+ 				# ADDED CODE FOR EXTRAFIELDS PLUGIN
+ 				ef_load($blog_id, $id);
+ 				# END ADDED CODE
  
                  $param{ping_errors} = $q->param('ping_errors');
***************
*** 729,732 ****
--- 733,739 ----
                  $param{disp_prefs_bar_colspan} = $param{new_object} ? 1 : 2;
              }
+ 			# ADDED CODE FOR EXTRAFIELDS PLUGIN
+ 			ef_prepare_html($blog_id, \%param);
+ 			# END ADDED CODE
  
              ## Load text filters.
***************
*** 1259,1262 ****
--- 1266,1272 ----
              }
              $obj->remove;
+             # ADDED CODE FOR EXTRAFIELDS PLUGIN
+             ef_delete($q->param('blog_id'), $id) if ($type eq 'entry');
+             # END ADDED CODE
          }
          my $blog_id = $q->param('blog_id');
***************
*** 1731,1734 ****
--- 1741,1747 ----
          }
      }
+ 	# ADDED CODE FOR EXTRAFIELDS PLUGIN
+ 	ef_save($obj->blog_id, $obj->id, $q);
+ 	# END ADDED CODE
  
      ## If the saved status is RELEASE, or if the *previous* status was
***************
*** 2168,2171 ****
--- 2181,2187 ----
      $param{new_object} = $param{id} ? 0 : 1;
      my $cols = MT::Entry->column_names;
+     # ADDED CODE FOR EXTRAFIELDS PLUGIN
+     push(@$cols, ef_column_names($blog_id));
+     # END ADDED CODE
      my @data = ({ data_name => 'author_id', data_value => $app->{author}->id });
      for my $col (@$cols) {