Index: handlers/views_handler_field_markup.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_markup.inc,v
retrieving revision 1.3.6.4
diff -u -p -r1.3.6.4 views_handler_field_markup.inc
--- handlers/views_handler_field_markup.inc	26 Oct 2010 20:26:37 -0000	1.3.6.4
+++ handlers/views_handler_field_markup.inc	16 Dec 2010 13:33:54 -0000
@@ -36,7 +36,7 @@ class views_handler_field_markup extends
     }
   }
 
-  function element_type() {
+  function element_type($none_supported = FALSE, $default_empty = FALSE) {
     if (isset($this->definition['element type'])) {
       return $this->definition['element type'];
     }
Index: modules/user/views_handler_field_user_picture.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_picture.inc,v
retrieving revision 1.1.6.4
diff -u -p -r1.1.6.4 views_handler_field_user_picture.inc
--- modules/user/views_handler_field_user_picture.inc	6 Jan 2010 20:55:01 -0000	1.1.6.4
+++ modules/user/views_handler_field_user_picture.inc	16 Dec 2010 13:33:55 -0000
@@ -12,7 +12,7 @@ class views_handler_field_user_picture e
     $this->additional_fields['mail'] = 'mail';   
   }
 
-  function element_type() {
+  function element_type($none_supported = FALSE, $default_empty = FALSE) {
     return 'div';
   }