Index: handlers/views_handler_argument.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument.inc,v
retrieving revision 1.9.4.8
diff -u -p -r1.9.4.8 views_handler_argument.inc
--- handlers/views_handler_argument.inc	12 Mar 2010 23:38:19 -0000	1.9.4.8
+++ handlers/views_handler_argument.inc	25 Aug 2010 15:11:53 -0000
@@ -46,7 +46,7 @@ class views_handler_argument extends vie
     }
   }
 
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
   }
 
Index: includes/admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/admin.inc,v
retrieving revision 1.161.4.46
diff -u -p -r1.161.4.46 admin.inc
--- includes/admin.inc	24 Aug 2010 16:13:22 -0000	1.161.4.46
+++ includes/admin.inc	25 Aug 2010 15:11:54 -0000
@@ -1072,7 +1072,8 @@ function template_preprocess_views_ui_ed
       'args' => array(),
     ),
   );
-  $vars['preview'] = drupal_render(drupal_build_form('views_ui_preview_form', $form_state));
+  $preview_form = drupal_build_form('views_ui_preview_form', $form_state);
+  $vars['preview'] = drupal_render($preview_form);
 
   $vars['locked'] = NULL;
   if (isset($view->locked) && is_object($view->locked)) {
@@ -1158,8 +1159,10 @@ function template_preprocess_views_ui_ed
       unset($_POST['form_id']);
     }
     $form_state = array('view' => &$view, 'display_id' => $display->id, 'ajax' => FALSE, 'build_info' => array('args' => array()));
-    $vars['remove'] = drupal_render(drupal_build_form('views_ui_remove_display_form', $form_state));
-    $vars['clone'] = drupal_render(drupal_build_form('views_ui_clone_display_form', $form_state));
+    $remove_form = drupal_build_form('views_ui_remove_display_form', $form_state);
+    $clone_form = drupal_build_form('views_ui_clone_display_form', $form_state);
+    $vars['remove'] = drupal_render($remove_form);
+    $vars['clone'] = drupal_render($clone_form);
   }
 
   // basic fields
@@ -3333,4 +3337,3 @@ function theme_views_ui_style_plugin_tab
   $output .= drupal_render_children($form);
   return $output;
 }
-
Index: modules/comment/views_handler_field_comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment.inc,v
retrieving revision 1.5
diff -u -p -r1.5 views_handler_field_comment.inc
--- modules/comment/views_handler_field_comment.inc	10 Feb 2009 20:37:49 -0000	1.5
+++ modules/comment/views_handler_field_comment.inc	25 Aug 2010 15:11:54 -0000
@@ -7,7 +7,7 @@ class views_handler_field_comment extend
   /**
    * Override init function to provide generic option to link to comment.
    */
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($this->options['link_to_comment'])) {
       $this->additional_fields['cid'] = 'cid';
Index: modules/node/views_plugin_row_node_view.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_plugin_row_node_view.inc,v
retrieving revision 1.3.6.2
diff -u -p -r1.3.6.2 views_plugin_row_node_view.inc
--- modules/node/views_plugin_row_node_view.inc	4 Jul 2010 11:04:36 -0000	1.3.6.2
+++ modules/node/views_plugin_row_node_view.inc	25 Aug 2010 15:11:54 -0000
@@ -18,7 +18,7 @@ class views_plugin_row_node_view extends
   // Stores the nodes loaded with pre_render.
   var $nodes = array();
 
-  function init(&$view, &$display, $options = NULL) {
+  function init(&$view, &$display, $options = array()) {
     parent::init($view, $display, $options);
     // Handle existing views with the deprecated 'teaser' option.
     if (isset($this->options['teaser'])) {
Index: modules/system/views_handler_field_file.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/system/views_handler_field_file.inc,v
retrieving revision 1.3.6.1
diff -u -p -r1.3.6.1 views_handler_field_file.inc
--- modules/system/views_handler_field_file.inc	2 Nov 2009 22:01:26 -0000	1.3.6.1
+++ modules/system/views_handler_field_file.inc	25 Aug 2010 15:11:54 -0000
@@ -7,7 +7,7 @@ class views_handler_field_file extends v
   /**
    * Constructor to provide additional field to add.
    */
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($options['link_to_file'])) {
       $this->additional_fields['uri'] = 'uri';
Index: modules/upload/views_handler_field_upload_description.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/upload/views_handler_field_upload_description.inc,v
retrieving revision 1.5.4.2
diff -u -p -r1.5.4.2 views_handler_field_upload_description.inc
--- modules/upload/views_handler_field_upload_description.inc	7 Apr 2010 23:40:26 -0000	1.5.4.2
+++ modules/upload/views_handler_field_upload_description.inc	25 Aug 2010 15:11:54 -0000
@@ -5,7 +5,7 @@
  * Field handler to provide a list of roles.
  */
 class views_handler_field_upload_description extends views_handler_field {
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($options['link_to_file'])) {
       $this->additional_fields['fid'] = 'fid';
Index: modules/user/views_handler_field_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user.inc,v
retrieving revision 1.3
diff -u -p -r1.3 views_handler_field_user.inc
--- modules/user/views_handler_field_user.inc	30 Jan 2009 00:01:42 -0000	1.3
+++ modules/user/views_handler_field_user.inc	25 Aug 2010 15:11:54 -0000
@@ -8,8 +8,8 @@ class views_handler_field_user extends v
   /**
    * Override init function to provide generic option to link to user.
    */
-  function init(&$view, &$data) {
-    parent::init($view, $data);
+  function init(&$view, $options) {
+    parent::init($view, $options);
     if (!empty($this->options['link_to_user'])) {
       $this->additional_fields['uid'] = 'uid';
     }
Index: modules/user/views_handler_field_user_name.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_name.inc,v
retrieving revision 1.2.6.1
diff -u -p -r1.2.6.1 views_handler_field_user_name.inc
--- modules/user/views_handler_field_user_name.inc	2 Nov 2009 22:01:27 -0000	1.2.6.1
+++ modules/user/views_handler_field_user_name.inc	25 Aug 2010 15:11:54 -0000
@@ -7,8 +7,8 @@ class views_handler_field_user_name exte
   /**
    * Add uid in the query so we can test for anonymous if needed.
    */
-  function init(&$view, &$data) {
-    parent::init($view, $data);
+  function init(&$view, $options) {
+    parent::init($view, $options);
     if (!empty($this->options['overwrite_anonymous'])) {
       $this->additional_fields['uid'] = 'uid';
     }
@@ -60,4 +60,3 @@ class views_handler_field_user_name exte
     return $data;
   }
 }
-
Index: plugins/views_plugin_display.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display.inc,v
retrieving revision 1.27.4.35
diff -u -p -r1.27.4.35 views_plugin_display.inc
--- plugins/views_plugin_display.inc	24 Aug 2010 16:13:23 -0000	1.27.4.35
+++ plugins/views_plugin_display.inc	25 Aug 2010 15:11:55 -0000
@@ -27,7 +27,7 @@
 class views_plugin_display extends views_plugin {
   var $handlers = array();
 
-  function init(&$view, &$display, $options = NULL) {
+  function init(&$view, &$display, $options = array()) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -1247,7 +1247,7 @@ class views_plugin_display extends views
               '#tree' => TRUE,
             ),
           );
-          
+
           $this->view->query->options_form($form['query']['options'], $form_state);
         }
         break;
@@ -2380,4 +2380,3 @@ class views_plugin_display extends views
 /**
  * @}
  */
-
Index: plugins/views_plugin_row.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_row.inc,v
retrieving revision 1.4.4.4
diff -u -p -r1.4.4.4 views_plugin_row.inc
--- plugins/views_plugin_row.inc	12 May 2010 22:29:46 -0000	1.4.4.4
+++ plugins/views_plugin_row.inc	25 Aug 2010 15:11:55 -0000
@@ -26,7 +26,7 @@ class views_plugin_row extends views_plu
   /**
    * Initialize the row plugin.
    */
-  function init(&$view, &$display, $options = NULL) {
+  function init(&$view, &$display, $options = array()) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -145,4 +145,3 @@ class views_plugin_row extends views_plu
 /**
  * @}
  */
-