Index: modules/node/views_handler_filter_node_status.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_filter_node_status.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_filter_node_status.inc
--- modules/node/views_handler_filter_node_status.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/node/views_handler_filter_node_status.inc	6 Feb 2010 18:23:34 -0000
@@ -4,10 +4,10 @@
  * Filter by published status
  */
 class views_handler_filter_node_status extends views_handler_filter {
-  function admin_summary() { }
-  function operator_form() { }
+  public function admin_summary() { }
+  public function operator_form() { }
 
-  function query() {
+  public function query() {
     $table = $this->ensure_my_table();
     $this->query->add_where($this->options['group'], "$table.status <> 0 OR ($table.uid = ***CURRENT_USER*** AND ***CURRENT_USER*** <> 0) OR ***ADMINISTER_NODES*** = 1");
   }
Index: modules/node/views_handler_filter_node_type.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_filter_node_type.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_filter_node_type.inc
--- modules/node/views_handler_filter_node_type.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/node/views_handler_filter_node_type.inc	6 Feb 2010 18:23:34 -0000
@@ -4,7 +4,7 @@
  * Filter by node type
  */
 class views_handler_filter_node_type extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Node type');
       $types = node_type_get_types();
Index: modules/node/views_handler_field_node_type.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_type.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_field_node_type.inc
--- modules/node/views_handler_field_node_type.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/node/views_handler_field_node_type.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Field handler to translate a node type into its readable form.
  */
 class views_handler_field_node_type extends views_handler_field_node {
-  function render($values) {
+  public function render($values) {
     $value = node_type_get_name($values->{$this->field_alias});
     return $this->render_link(t(check_plain($value)), $values);
   }
Index: modules/node/views_handler_field_node_revision_link_delete.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_field_node_revision_link_delete.inc
--- modules/node/views_handler_field_node_revision_link_delete.inc	17 Jan 2010 19:56:43 -0000	1.1.6.1
+++ modules/node/views_handler_field_node_revision_link_delete.inc	6 Feb 2010 18:23:33 -0000
@@ -4,18 +4,18 @@
  * Field handler to present delete a node revision.
  */
 class views_handler_field_node_revision_link_delete extends views_handler_field_node_link {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['uid'] = array('table' => 'node', 'field' => 'uid');
     $this->additional_fields['node_vid'] = array('table' => 'node', 'field' => 'vid');
     $this->additional_fields['vid'] = 'vid';
   }
 
-  function access() {
+  public function access() {
     return user_access('delete revisions') || user_access('administer nodes');
   }
 
-  function render($values) {
+  public function render($values) {
     // ensure user has access to edit this node.
     $node = new stdClass();
     $node->nid = $values->{$this->aliases['nid']};
Index: modules/node/views_handler_argument_node_vid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_argument_node_vid.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_node_vid.inc
--- modules/node/views_handler_argument_node_vid.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/node/views_handler_argument_node_vid.inc	6 Feb 2010 18:23:33 -0000
@@ -14,7 +14,7 @@
   /**
    * Override the behavior of title(). Get the title of the revision.
    */
-  function title_query() {
+  public function title_query() {
     $titles = array();
 
     $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.nid IN (:nids)", array(':nids' => $this->value));
Index: modules/node/views_handler_field_node_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_link.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_node_link.inc
--- modules/node/views_handler_field_node_link.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/node/views_handler_field_node_link.inc	6 Feb 2010 18:23:33 -0000
@@ -4,12 +4,12 @@
  * Field handler to present a link to the node.
  */
 class views_handler_field_node_link extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['nid'] = 'nid';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['text'] = array('default' => '', 'translatable' => TRUE);
@@ -17,7 +17,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['text'] = array(
       '#type' => 'textfield',
@@ -26,12 +26,12 @@
     );
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
     $nid = $values->{$this->aliases['nid']};
     return l($text, "node/$nid");
Index: modules/node/views_handler_argument_node_language.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_argument_node_language.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_argument_node_language.inc
--- modules/node/views_handler_argument_node_language.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/node/views_handler_argument_node_language.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Argument handler to accept a language.
  */
 class views_handler_argument_node_language extends views_handler_argument {
-  function construct() {
+  public function construct() {
     parent::construct('language');
   }
 
@@ -12,7 +12,7 @@
    * Override the behavior of summary_name(). Get the user friendly version
    * of the language.
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     return $this->node_language($data->{$this->name_alias});
   }
 
@@ -20,11 +20,11 @@
    * Override the behavior of title(). Get the user friendly version of the
    * node type.
    */
-  function title() {
+  public function title() {
     return $this->node_language($this->argument);
   }
 
-  function node_language($langcode) {
+  public function node_language($langcode) {
     $languages = locale_language_list();
     return isset($languages[$langcode]) ? $languages[$langcode] : t('Unknown language');
   }
Index: modules/node/views_handler_filter_node_access.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_filter_node_access.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_filter_node_access.inc
--- modules/node/views_handler_filter_node_access.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/node/views_handler_filter_node_access.inc	6 Feb 2010 18:23:34 -0000
@@ -4,16 +4,16 @@
  * Filter by node_access records.
  */
 class views_handler_filter_node_access extends views_handler_filter {
-  function admin_summary() { }
-  function operator_form() { }
-  function can_expose() {
+  public function admin_summary() { }
+  public function operator_form() { }
+  public function can_expose() {
     return FALSE;
   }
 
   /**
    * See _node_access_where_sql() for a non-views query based implementation.
    */
-  function query() {
+  public function query() {
     if (!user_access('administer nodes')) {
       $table = $this->ensure_my_table();
       $grants = db_or();
Index: modules/node/views_handler_argument_node_type.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_argument_node_type.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_argument_node_type.inc
--- modules/node/views_handler_argument_node_type.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/node/views_handler_argument_node_type.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Argument handler to accept a node type.
  */
 class views_handler_argument_node_type extends views_handler_argument {
-  function construct() {
+  public function construct() {
     parent::construct('type');
   }
 
@@ -12,7 +12,7 @@
    * Override the behavior of summary_name(). Get the user friendly version
    * of the node type.
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     return $this->node_type($data->{$this->name_alias});
   }
 
@@ -20,11 +20,11 @@
    * Override the behavior of title(). Get the user friendly version of the
    * node type.
    */
-  function title() {
+  public function title() {
     return $this->node_type($this->argument);
   }
 
-  function node_type($type) {
+  public function node_type($type) {
     $output = node_type_get_name($type);
     if (empty($output)) {
       $output = t('Unknown node type');
Index: modules/node/views_plugin_argument_validate_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_plugin_argument_validate_node.inc,v
retrieving revision 1.2.4.2
diff -u -r1.2.4.2 views_plugin_argument_validate_node.inc
--- modules/node/views_plugin_argument_validate_node.inc	28 Jan 2010 22:44:36 -0000	1.2.4.2
+++ modules/node/views_plugin_argument_validate_node.inc	6 Feb 2010 18:23:34 -0000
@@ -9,7 +9,7 @@
  * Validate whether an argument is an acceptable node.
  */
 class views_plugin_argument_validate_node extends views_plugin_argument_validate {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['types'] = array('default' => array());
     $options['access'] = array('default' => FALSE);
@@ -18,7 +18,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $types = node_type_get_types();
     foreach ($types as $type => $info) {
       $options[$type] = check_plain(t($info->name));
@@ -49,12 +49,12 @@
     );
   }
 
-  function options_submit(&$form, &$form_state, &$options) {
+  public function options_submit(&$form, &$form_state, &$options) {
     // filter trash out of the options so we don't store giant unnecessary arrays
     $options['types'] = array_filter($options['types']);
   }
 
-  function convert_options(&$options) {
+  public function convert_options(&$options) {
     if (!isset($options['types']) && !empty($this->argument->options['validate_argument_node_type'])) {
       $options['types'] = $this->argument->options['validate_argument_node_type'];
       $options['access'] = !empty($this->argument->options['validate_argument_node_access']);
@@ -62,7 +62,7 @@
     }
   }
 
-  function validate_argument($argument) {
+  public function validate_argument($argument) {
     $types = $this->options['types'];
 
     switch ($this->options['nid_type']) {
Index: modules/node/views_handler_field_history_user_timestamp.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_history_user_timestamp.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_handler_field_history_user_timestamp.inc
--- modules/node/views_handler_field_history_user_timestamp.inc	6 Feb 2010 16:29:52 -0000	1.1.6.2
+++ modules/node/views_handler_field_history_user_timestamp.inc	6 Feb 2010 18:23:33 -0000
@@ -6,7 +6,7 @@
  * The handler is named history_user, because of compability reasons, the table is history.
  */
 class views_handler_field_history_user_timestamp extends views_handler_field_node {
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
     global $user;
     if ($user->uid) {
@@ -18,7 +18,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['comments'] = array('default' => FALSE);
@@ -26,7 +26,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     if (module_exists('comment')) {
       $form['comments'] = array(
@@ -37,7 +37,7 @@
     }
   }
 
-  function query() {
+  public function query() {
     // Only add ourselves to the query if logged in.
     global $user;
     if (!$user->uid) {
@@ -46,7 +46,7 @@
     parent::query();
   }
 
-  function render($values) {
+  public function render($values) {
     // Let's default to 'read' state.
     // This code shadows node_mark, but it reads from the db directly and
     // we already have that info.
Index: modules/node/views_handler_field_node_link_delete.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_link_delete.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_field_node_link_delete.inc
--- modules/node/views_handler_field_node_link_delete.inc	17 Jan 2010 19:56:43 -0000	1.1.6.1
+++ modules/node/views_handler_field_node_link_delete.inc	6 Feb 2010 18:23:33 -0000
@@ -4,13 +4,13 @@
  * Field handler to present a link to delete a node.
  */
 class views_handler_field_node_link_delete extends views_handler_field_node_link {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['type'] = 'type';
     $this->additional_fields['uid'] = 'uid';
   }
 
-  function render($values) {
+  public function render($values) {
     // ensure user has access to edit this node.
     $node = new stdClass();
     $node->nid = $values->{$this->aliases['nid']};
Index: modules/node/views_handler_field_node_link_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_link_edit.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_field_node_link_edit.inc
--- modules/node/views_handler_field_node_link_edit.inc	17 Jan 2010 19:56:43 -0000	1.1.6.1
+++ modules/node/views_handler_field_node_link_edit.inc	6 Feb 2010 18:23:33 -0000
@@ -4,13 +4,13 @@
  * Field handler to present a link node edit.
  */
 class views_handler_field_node_link_edit extends views_handler_field_node_link {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['uid'] = 'uid';
     $this->additional_fields['type'] = 'type';
   }
 
-  function render($values) {
+  public function render($values) {
     // ensure user has access to edit this node.
     $node = new stdClass();
     $node->nid = $values->{$this->aliases['nid']};
Index: modules/node/views_handler_argument_node_nid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_argument_node_nid.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_node_nid.inc
--- modules/node/views_handler_argument_node_nid.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/node/views_handler_argument_node_nid.inc	6 Feb 2010 18:23:33 -0000
@@ -12,7 +12,7 @@
   /**
    * Override the behavior of title(). Get the title of the node.
    */
-  function title_query() {
+  public function title_query() {
     $titles = array();
 
     $result = db_query("SELECT n.title FROM {node} n WHERE n.nid IN (:nids)", array(':nids' => $this->value));
Index: modules/node/views_plugin_argument_default_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_plugin_argument_default_node.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_plugin_argument_default_node.inc
--- modules/node/views_plugin_argument_default_node.inc	28 Jan 2010 22:44:36 -0000	1.1.6.1
+++ modules/node/views_plugin_argument_default_node.inc	6 Feb 2010 18:23:34 -0000
@@ -11,7 +11,7 @@
  * This plugin actually has no options so it odes not need to do a great deal.
  */
 class views_plugin_argument_default_node extends views_plugin_argument_default {
-  function get_argument() {
+  public function get_argument() {
     foreach (range(1, 3) as $i) {
       $node = menu_get_object('node', $i);
       if (!empty($node)) {
Index: modules/node/views_handler_argument_dates_various.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_argument_dates_various.inc,v
retrieving revision 1.4.6.1
diff -u -r1.4.6.1 views_handler_argument_dates_various.inc
--- modules/node/views_handler_argument_dates_various.inc	6 Feb 2010 16:38:11 -0000	1.4.6.1
+++ modules/node/views_handler_argument_dates_various.inc	6 Feb 2010 18:23:33 -0000
@@ -7,7 +7,7 @@
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->format = 'F j, Y';
     $this->arg_format = 'Ymd';
@@ -17,7 +17,7 @@
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $created = $data->{$this->name_alias};
     return format_date(strtotime($created), 'custom', $this->format, 0);
   }
@@ -25,7 +25,7 @@
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     return format_date(strtotime($this->argument), 'custom', $this->format, 0);
   }
 }
@@ -37,7 +37,7 @@
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->arg_format = 'Y';
     $this->formula = views_date_sql_extract('YEAR', "***table***.$this->real_field");
@@ -51,7 +51,7 @@
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->format = 'F Y';
     $this->arg_format = 'Ym';
@@ -61,7 +61,7 @@
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $created = $data->{$this->name_alias};
     // @todo fix this! I removed ,0 but the whole timezone handling is broken.
     return format_date(strtotime($created . "15"), 'custom', $this->format);
@@ -70,7 +70,7 @@
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     // @todo fix this! I removed ,0 but the whole timezone handling is broken.
     return format_date(strtotime($this->argument . "15"), 'custom', $this->format);
   }
@@ -83,7 +83,7 @@
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->formula = views_date_sql_extract('MONTH', "***table***.$this->real_field");
     $this->format = 'F';
@@ -93,7 +93,7 @@
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $month = str_pad($data->{$this->name_alias}, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . $month . "15"), 'custom', $this->format);
   }
@@ -101,12 +101,12 @@
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     $month = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . $month . "15"), 'custom', $this->format, 0);
   }
 
-  function summary_argument($data) {
+  public function summary_argument($data) {
     // Make sure the argument contains leading zeroes.
     return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
   }
@@ -119,7 +119,7 @@
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->formula = views_date_sql_extract('DAY', "***table***.$this->real_field");
     $this->format = 'j';
@@ -129,7 +129,7 @@
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $day = str_pad($data->{$this->name_alias}, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . "05" . $day), 'custom', $this->format, 0);
   }
@@ -137,12 +137,12 @@
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     $day = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . "05" . $day), 'custom', $this->format, 0);
   }
 
-  function summary_argument($data) {
+  public function summary_argument($data) {
     // Make sure the argument contains leading zeroes.
     return str_pad($data->{$this->base_alias}, 2, '0', STR_PAD_LEFT);
   }
@@ -155,7 +155,7 @@
   /**
    * Constructor implementation
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->arg_format = 'w';
     $this->formula = views_date_sql_extract('WEEK', "***table***.$this->real_field");
@@ -164,7 +164,7 @@
   /**
    * Provide a link to the next level of the view
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $created = $data->{$this->name_alias};
     return t('Week @week', array('@week' => $created));
   }
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
diff -u -r1.3 views_plugin_row_node_view.inc
--- modules/node/views_plugin_row_node_view.inc	8 Apr 2009 20:54:58 -0000	1.3
+++ modules/node/views_plugin_row_node_view.inc	6 Feb 2010 18:23:34 -0000
@@ -12,10 +12,10 @@
  */
 class views_plugin_row_node_view extends views_plugin_row {
   // Basic properties that let the row style follow relationships.
-  var $base_table = 'node';
-  var $base_field = 'nid';
+  public $base_table = 'node';
+  public $base_field = 'nid';
 
-  function init(&$view, &$display, $options = NULL) {
+  public function init(&$view, &$display, $options = NULL) {
     parent::init($view, $display, $options);
     // Handle existing views with the deprecated 'teaser' option.
     if (isset($this->options['teaser'])) {
@@ -23,7 +23,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['build_mode'] = array('default' => 'teaser');
@@ -33,7 +33,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     // CCK holds the registry of available build modes, but can hardly
Index: modules/node/views_handler_filter_history_user_timestamp.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_filter_history_user_timestamp.inc,v
retrieving revision 1.3.4.2
diff -u -r1.3.4.2 views_handler_filter_history_user_timestamp.inc
--- modules/node/views_handler_filter_history_user_timestamp.inc	6 Feb 2010 16:29:52 -0000	1.3.4.2
+++ modules/node/views_handler_filter_history_user_timestamp.inc	6 Feb 2010 18:23:34 -0000
@@ -7,13 +7,13 @@
  */
 class views_handler_filter_history_user_timestamp extends views_handler_filter {
   // Don't display empty space where the operator would be.
-  var $no_operator = TRUE;
+  public $no_operator = TRUE;
 
-  function expose_form_right() {
+  public function expose_form_right() {
     // We don't want any of the usual options for exposed filters.
   }
 
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     // Only present a checkbox for the exposed filter itself. There's no way
     // to tell the difference between not checked and the default value, so
     // specifying the default value via the views UI is meaningless.
@@ -32,7 +32,7 @@
     }
   }
 
-  function query() {
+  public function query() {
     global $user;
     // This can only work if we're logged in.
     if (!$user || !$user->uid) {
@@ -65,7 +65,7 @@
     $this->query->add_where($this->options['group'], "($field IS NULL AND ($node.changed > (***CURRENT_TIME*** - $limit) $clause)) OR $field < $node.changed $clause2");
   }
 
-  function admin_summary() {
+  public function admin_summary() {
     if (!empty($this->options['exposed'])) {
       return t('exposed');
     }
Index: modules/node/views_handler_field_node_revision_link_revert.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_field_node_revision_link_revert.inc
--- modules/node/views_handler_field_node_revision_link_revert.inc	17 Jan 2010 19:56:43 -0000	1.1.6.1
+++ modules/node/views_handler_field_node_revision_link_revert.inc	6 Feb 2010 18:23:33 -0000
@@ -4,18 +4,18 @@
  * Field handler to present a link to revert a node to a revision
  */
 class views_handler_field_node_revision_link_revert extends views_handler_field_node_link {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['uid'] = array('table' => 'node', 'field' => 'uid');
     $this->additional_fields['node_vid'] = array('table' => 'node', 'field' => 'vid');
     $this->additional_fields['vid'] = 'vid';
   }
 
-  function access() {
+  public function access() {
     return user_access('revert revisions') || user_access('administer nodes');
   }
 
-  function render($values) {
+  public function render($values) {
     // ensure user has access to edit this node.
     $node = new stdClass();
     $node->nid = $values->{$this->aliases['nid']};
Index: modules/node/views_handler_field_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node.inc,v
retrieving revision 1.7.4.2
diff -u -r1.7.4.2 views_handler_field_node.inc
--- modules/node/views_handler_field_node.inc	24 Jan 2010 22:37:52 -0000	1.7.4.2
+++ modules/node/views_handler_field_node.inc	6 Feb 2010 18:23:33 -0000
@@ -10,7 +10,7 @@
  */
 class views_handler_field_node extends views_handler_field {
 
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($this->options['link_to_node'])) {
       $this->additional_fields['nid'] = 'nid';
@@ -20,7 +20,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_node'] = array('default' => FALSE);
     return $options;
@@ -29,7 +29,7 @@
   /**
    * Provide link to node option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_node'] = array(
       '#title' => t('Link this field to its node'),
@@ -44,7 +44,7 @@
    *
    * Data should be made XSS safe prior to calling this function.
    */
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
@@ -58,7 +58,7 @@
     return $data;
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 }
Index: modules/node/views_plugin_row_node_rss.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_plugin_row_node_rss.inc,v
retrieving revision 1.7.4.2
diff -u -r1.7.4.2 views_plugin_row_node_rss.inc
--- modules/node/views_plugin_row_node_rss.inc	27 Jan 2010 23:28:35 -0000	1.7.4.2
+++ modules/node/views_plugin_row_node_rss.inc	6 Feb 2010 18:23:34 -0000
@@ -11,10 +11,10 @@
  */
 class views_plugin_row_node_rss extends views_plugin_row {
   // Basic properties that let the row style follow relationships.
-  var $base_table = 'node';
-  var $base_field = 'nid';
+  public $base_table = 'node';
+  public $base_field = 'nid';
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['item_length'] = array('default' => 'default');
@@ -22,7 +22,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['item_length'] = array(
@@ -38,7 +38,7 @@
     );
   }
 
-  function render($row) {
+  public function render($row) {
     // For the most part, this code is taken from node_feed() in node.module
     global $base_url;
 
Index: modules/translation/views_handler_argument_node_tnid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/translation/views_handler_argument_node_tnid.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_node_tnid.inc
--- modules/translation/views_handler_argument_node_tnid.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/translation/views_handler_argument_node_tnid.inc	6 Feb 2010 18:23:34 -0000
@@ -12,7 +12,7 @@
   /**
    * Override the behavior of title(). Get the title of the node.
    */
-  function title_query() {
+  public function title_query() {
     $titles = array();
 
     $result = db_query("SELECT n.title FROM {node} n WHERE n.tnid IN (:tnids)", array(':tnis' => $this->value));
Index: modules/translation/views_handler_filter_node_language.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/translation/views_handler_filter_node_language.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_node_language.inc
--- modules/translation/views_handler_filter_node_language.inc	30 Sep 2008 22:07:15 -0000	1.1
+++ modules/translation/views_handler_filter_node_language.inc	6 Feb 2010 18:23:34 -0000
@@ -4,7 +4,7 @@
  * Filter by language
  */
 class views_handler_filter_node_language extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Language');
       $languages = array('***CURRENT_LANGUAGE***' => t("Current user's language"), '***DEFAULT_LANGUAGE***' => t("Default site language"), '***NO_LANGUAGE***' => t('No language'));
Index: modules/translation/views_handler_field_node_language.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/translation/views_handler_field_node_language.inc,v
retrieving revision 1.2
diff -u -r1.2 views_handler_field_node_language.inc
--- modules/translation/views_handler_field_node_language.inc	28 Oct 2008 17:46:14 -0000	1.2
+++ modules/translation/views_handler_field_node_language.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Field handler to translate a language into its readable form.
  */
 class views_handler_field_node_language extends views_handler_field_node {
-  function render($values) {
+  public function render($values) {
     $languages = locale_language_list();
     $value = isset($languages[$values->{$this->field_alias}]) ? $languages[$values->{$this->field_alias}] : '';
     return $this->render_link($value, $values);
Index: modules/translation/views_handler_relationship_translation.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/translation/views_handler_relationship_translation.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_relationship_translation.inc
--- modules/translation/views_handler_relationship_translation.inc	30 Sep 2008 22:07:15 -0000	1.1
+++ modules/translation/views_handler_relationship_translation.inc	6 Feb 2010 18:23:34 -0000
@@ -6,7 +6,7 @@
  * options.
  */
 class views_handler_relationship_translation extends views_handler_relationship {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['language'] = array('default' => 'current');
 
@@ -16,7 +16,7 @@
   /**
    * Add a translation selector.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $options = array(
@@ -37,7 +37,7 @@
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     // Figure out what base table this relationship brings to the party.
     $table_data = views_fetch_data($this->definition['base']);
     $base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
Index: modules/translation/views_handler_filter_node_tnid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/translation/views_handler_filter_node_tnid.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_node_tnid.inc
--- modules/translation/views_handler_filter_node_tnid.inc	2 Dec 2008 16:34:24 -0000	1.1
+++ modules/translation/views_handler_filter_node_tnid.inc	6 Feb 2010 18:23:34 -0000
@@ -4,8 +4,8 @@
  * Filter by whether the node is the original translation.
  */
 class views_handler_filter_node_tnid extends views_handler_filter {
-  function admin_summary() { }
-  function option_definition() {
+  public function admin_summary() { }
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['operator']['default'] = 1;
@@ -16,7 +16,7 @@
   /**
    * Provide simple boolean operator
    */
-  function operator_form(&$form, &$form_state) {
+  public function operator_form(&$form, &$form_state) {
     $form['operator'] = array(
       '#type' => 'radios',
       '#title' => t('Include untranslated nodes'),
@@ -28,9 +28,9 @@
     );
   }
 
-  function can_expose() { return FALSE; }
+  public function can_expose() { return FALSE; }
 
-  function query() {
+  public function query() {
     $table = $this->ensure_my_table();
     // Select for source translations (tnid = nid). Conditionally, also accept either untranslated nodes (tnid = 0).
     $this->query->add_where($this->options['group'], "$table.tnid = $table.nid" . ($this->operator ? " OR $table.tnid = 0" : ''));
Index: modules/translation/views_handler_filter_node_tnid_child.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/translation/views_handler_filter_node_tnid_child.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_node_tnid_child.inc
--- modules/translation/views_handler_filter_node_tnid_child.inc	2 Dec 2008 18:57:27 -0000	1.1
+++ modules/translation/views_handler_filter_node_tnid_child.inc	6 Feb 2010 18:23:34 -0000
@@ -4,11 +4,11 @@
  * Filter by whether the node is not the original translation.
  */
 class views_handler_filter_node_tnid_child extends views_handler_filter {
-  function admin_summary() { }
-  function operator_form(&$form, &$form_state) { }
-  function can_expose() { return FALSE; }
+  public function admin_summary() { }
+  public function operator_form(&$form, &$form_state) { }
+  public function can_expose() { return FALSE; }
 
-  function query() {
+  public function query() {
     $table = $this->ensure_my_table();
     $this->query->add_where($this->options['group'], "$table.tnid <> $table.nid AND $table.tnid > 0");
   }
Index: modules/translation/views_handler_field_node_translation_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/translation/views_handler_field_node_translation_link.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_node_translation_link.inc
--- modules/translation/views_handler_field_node_translation_link.inc	30 Sep 2008 22:07:15 -0000	1.1
+++ modules/translation/views_handler_field_node_translation_link.inc	6 Feb 2010 18:23:34 -0000
@@ -4,7 +4,7 @@
  * Field handler to present a link to the node.
  */
 class views_handler_field_node_translation_link extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['nid'] = 'nid';
     $this->additional_fields['tnid'] = 'tnid';
@@ -12,12 +12,12 @@
     $this->additional_fields['language'] = 'language';
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     global $language;
     $tnid = $values->{$this->aliases['tnid']};
     // Only load translations if the node isn't in the current language.
Index: modules/user/views_handler_filter_user_current.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_filter_user_current.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_filter_user_current.inc
--- modules/user/views_handler_filter_user_current.inc	2 Nov 2009 22:01:27 -0000	1.2.4.1
+++ modules/user/views_handler_filter_user_current.inc	6 Feb 2010 18:23:34 -0000
@@ -5,12 +5,12 @@
  * Filter handler for the current user
  */
 class views_handler_filter_user_current extends views_handler_filter_boolean_operator {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->value_value = t('Is the logged in user');
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     // OLD: $this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field " . (empty($this->value) ? '!=' : '=') . " ***CURRENT_USER***");
Index: modules/user/views_handler_field_user_link_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_link_edit.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_user_link_edit.inc
--- modules/user/views_handler_field_user_link_edit.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/user/views_handler_field_user_link_edit.inc	6 Feb 2010 18:23:34 -0000
@@ -5,11 +5,11 @@
  */
 class views_handler_field_user_link_edit extends views_handler_field_user_link {
   // An example of field level access control.
-  function access() {
+  public function access() {
     return user_access('administer users');
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
     $uid = $values->{$this->aliases['uid']};
     return l($text, "user/$uid/edit", array('query' => drupal_get_destination()));
Index: modules/user/views_handler_filter_user_roles.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_filter_user_roles.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_user_roles.inc
--- modules/user/views_handler_filter_user_roles.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/user/views_handler_filter_user_roles.inc	6 Feb 2010 18:23:34 -0000
@@ -4,7 +4,7 @@
  * Filter handler for user roles
  */
 class views_handler_filter_user_roles extends views_handler_filter_many_to_one {
-  function get_value_options() {
+  public function get_value_options() {
     $this->value_options = user_roles(TRUE);
     unset($this->value_options[DRUPAL_AUTHENTICATED_RID]);
   }
Index: modules/user/views_handler_field_user_roles.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_roles.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_field_user_roles.inc
--- modules/user/views_handler_field_user_roles.inc	2 Nov 2009 22:01:27 -0000	1.2.4.1
+++ modules/user/views_handler_field_user_roles.inc	6 Feb 2010 18:23:34 -0000
@@ -4,17 +4,17 @@
  * Field handler to provide a list of roles.
  */
 class views_handler_field_user_roles extends views_handler_field_prerender_list {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['uid'] = array('table' => 'users', 'field' => 'uid');
   }
 
-  function query() {
+  public function query() {
     $this->add_additional_fields();
     $this->field_alias = $this->aliases['uid'];
   }
 
-  function pre_render($values) {
+  public function pre_render($values) {
     $uids = array();
     $this->items = array();
 
@@ -32,16 +32,16 @@
     }
   }
 
-  function render_item($count, $item) {
+  public function render_item($count, $item) {
     return $item['role'];
   }
 
-  function document_self_tokens(&$tokens) {
+  public function document_self_tokens(&$tokens) {
     $tokens['[' . $this->options['id'] . '-role' . ']'] = t('The name of the role.');
     $tokens['[' . $this->options['id'] . '-rid' . ']'] = t('The role ID of the role.');
   }
 
-  function add_self_tokens(&$tokens, $item) {
+  public function add_self_tokens(&$tokens, $item) {
     $tokens['[' . $this->options['id'] . '-role' . ']'] = $item['role'];
     $tokens['[' . $this->options['id'] . '-rid' . ']'] = $item['rid'];
   }
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 -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	6 Feb 2010 18:23:34 -0000
@@ -7,14 +7,14 @@
   /**
    * Add uid in the query so we can test for anonymous if needed.
    */
-  function init(&$view, &$data) {
+  public function init(&$view, &$data) {
     parent::init($view, $data);
     if (!empty($this->options['overwrite_anonymous'])) {
       $this->additional_fields['uid'] = 'uid';
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['overwrite_anonymous'] = array('default' => FALSE);
@@ -23,7 +23,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['overwrite_anonymous'] = array(
@@ -43,7 +43,7 @@
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_user']) || !empty($this->options['overwrite_anonymous'])) {
       $account = new stdClass();
       $account->uid = $values->{$this->aliases['uid']};
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 -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	6 Feb 2010 18:23:34 -0000
@@ -5,18 +5,18 @@
  * Field handler to provide simple renderer that allows using a themed user link
  */
 class views_handler_field_user_picture extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['uid'] = 'uid';
     $this->additional_fields['name'] = 'name';
-    $this->additional_fields['mail'] = 'mail';   
+    $this->additional_fields['mail'] = 'mail';
   }
 
-  function element_type() {
+  public function element_type() {
     return 'div';
   }
 
-  function render($values) {
+  public function render($values) {
     // Fake an account object.
     $account = new stdClass();
     $account->uid = $values->{$this->aliases['uid']};
Index: modules/user/views_handler_argument_users_roles_rid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_argument_users_roles_rid.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_users_roles_rid.inc
--- modules/user/views_handler_argument_users_roles_rid.inc	2 Nov 2009 22:01:27 -0000	1.1.6.1
+++ modules/user/views_handler_argument_users_roles_rid.inc	6 Feb 2010 18:23:34 -0000
@@ -4,7 +4,7 @@
  * Allow role ID(s) as argument
  */
 class views_handler_argument_users_roles_rid extends views_handler_argument_many_to_one {
-  function title_query() {
+  public function title_query() {
     $titles = array();
 
     $result = db_query("SELECT name FROM {role} WHERE rid IN (:rids)", array(':rids' => $this->value));
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 -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	6 Feb 2010 18:23:34 -0000
@@ -8,14 +8,14 @@
   /**
    * Override init function to provide generic option to link to user.
    */
-  function init(&$view, &$data) {
+  public function init(&$view, &$data) {
     parent::init($view, $data);
     if (!empty($this->options['link_to_user'])) {
       $this->additional_fields['uid'] = 'uid';
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_user'] = array('default' => TRUE);
     return $options;
@@ -24,7 +24,7 @@
   /**
    * Provide link to node option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_user'] = array(
       '#title' => t('Link this field to its user'),
@@ -34,7 +34,7 @@
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_user']) && user_access('access user profiles') && $values->{$this->aliases['uid']} && $data !== NULL && $data !== '') {
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['path'] = "user/" . $values->{$this->aliases['uid']};
@@ -42,7 +42,7 @@
     return $data;
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 }
Index: modules/user/views_handler_field_user_language.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_language.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_field_user_language.inc
--- modules/user/views_handler_field_user_language.inc	2 Nov 2009 22:01:27 -0000	1.1.6.1
+++ modules/user/views_handler_field_user_language.inc	6 Feb 2010 18:23:34 -0000
@@ -7,7 +7,7 @@
 
 class views_handler_field_user_language extends views_handler_field_user {
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_user']) && user_access('access user profiles') && $values->{$this->aliases['uid']}) {
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['path'] = 'user/' . $values->{$this->aliases['uid']};
@@ -23,7 +23,7 @@
     return check_plain($lang->name);
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 }
Index: modules/user/views_handler_field_user_link_delete.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_link_delete.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_user_link_delete.inc
--- modules/user/views_handler_field_user_link_delete.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/user/views_handler_field_user_link_delete.inc	6 Feb 2010 18:23:34 -0000
@@ -5,11 +5,11 @@
  */
 class views_handler_field_user_link_delete extends views_handler_field_user_link {
   // An example of field level access control.
-  function access() {
+  public function access() {
     return user_access('administer users');
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
     $uid = $values->{$this->aliases['uid']};
     return l($text, "user/$uid/delete", array('query' => drupal_get_destination()));
Index: modules/user/views_handler_field_user_mail.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_mail.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_user_mail.inc
--- modules/user/views_handler_field_user_mail.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/user/views_handler_field_user_mail.inc	6 Feb 2010 18:23:34 -0000
@@ -4,13 +4,13 @@
  * Field handler to provide acess control for the email field
  */
 class views_handler_field_user_mail extends views_handler_field_user {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_user'] = array('default' => 'mailto');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_user'] = array(
       '#title' => t('Link this field'),
@@ -24,7 +24,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     if ($this->options['link_to_user'] == 'mailto') {
       return l($values->{$this->field_alias}, "mailto:" . $values->{$this->field_alias});
     }
Index: modules/user/views_handler_filter_user_name.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_filter_user_name.inc,v
retrieving revision 1.2.6.1
diff -u -r1.2.6.1 views_handler_filter_user_name.inc
--- modules/user/views_handler_filter_user_name.inc	2 Nov 2009 22:01:27 -0000	1.2.6.1
+++ modules/user/views_handler_filter_user_name.inc	6 Feb 2010 18:23:34 -0000
@@ -5,9 +5,9 @@
  * Filter handler for usernames
  */
 class views_handler_filter_user_name extends views_handler_filter_in_operator {
-  var $no_single = TRUE;
+  public $no_single = TRUE;
 
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     $values = array();
     if ($this->value) {
       $result = db_query("SELECT * FROM {users} u WHERE uid IN (:uids)", array(':uids' => $this->value));
@@ -36,7 +36,7 @@
     }
   }
 
-  function value_validate(&$form, &$form_state) {
+  public function value_validate(&$form, &$form_state) {
     $values = drupal_explode_tags($form_state['values']['options']['value']);
     $uids = $this->validate_user_strings($form['value'], $values);
 
@@ -45,7 +45,7 @@
     }
   }
 
-  function accept_exposed_input($input) {
+  public function accept_exposed_input($input) {
     $rc = parent::accept_exposed_input($input);
 
     if ($rc) {
@@ -58,7 +58,7 @@
     return $rc;
   }
 
-  function exposed_validate(&$form, &$form_state) {
+  public function exposed_validate(&$form, &$form_state) {
     if (empty($this->options['exposed'])) {
       return;
     }
@@ -82,7 +82,7 @@
    * or the exposed filter, this is abstracted out a bit so it can
    * handle the multiple input sources.
    */
-  function validate_user_strings(&$form, $values) {
+  public function validate_user_strings(&$form, $values) {
     $uids = array();
     $placeholders = array();
     $args = array();
@@ -115,14 +115,14 @@
     return $uids;
   }
 
-  function value_submit() {
+  public function value_submit() {
     // prevent array filter from removing our anonymous user.
   }
 
   // Override to do nothing.
-  function get_value_options() { }
+  public function get_value_options() { }
 
-  function admin_summary() {
+  public function admin_summary() {
     // set up $this->value_options for the parent summary
     $this->value_options = array();
 
Index: modules/user/views_plugin_argument_validate_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_plugin_argument_validate_user.inc,v
retrieving revision 1.2.6.3
diff -u -r1.2.6.3 views_plugin_argument_validate_user.inc
--- modules/user/views_plugin_argument_validate_user.inc	29 Jan 2010 00:18:54 -0000	1.2.6.3
+++ modules/user/views_plugin_argument_validate_user.inc	6 Feb 2010 18:23:34 -0000
@@ -9,7 +9,7 @@
  * argument's title to the username.
  */
 class views_plugin_argument_validate_user extends views_plugin_argument_validate {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['type'] = array('default' => 'uid');
     $options['restrict_roles'] = array('default' => FALSE);
@@ -18,7 +18,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['type'] = array(
       '#type' => 'radios',
       '#title' => t('Type of user argument to allow'),
@@ -51,12 +51,12 @@
     );
   }
 
-  function options_submit(&$form, &$form_state, &$options) {
+  public function options_submit(&$form, &$form_state, &$options) {
     // filter trash out of the options so we don't store giant unnecessary arrays
     $options['roles'] = array_filter($options['roles']);
   }
 
-  function convert_options(&$options) {
+  public function convert_options(&$options) {
     if (!isset($options['type']) && isset($this->argument->options['validate_user_argument_type'])) {
       $options['type'] = $this->argument->options['validate_user_argument_type'];
       $options['restrict_roles'] = $this->argument->options['validate_user_restrict_roles'];
@@ -64,7 +64,7 @@
     }
   }
 
-  function validate_argument($argument) {
+  public function validate_argument($argument) {
     $type = $this->options['type'];
     // is_numeric() can return false positives, so we ensure it's an integer.
     // However, is_integer() will always fail, since $argument is a string.
Index: modules/user/views_handler_argument_user_uid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_argument_user_uid.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_user_uid.inc
--- modules/user/views_handler_argument_user_uid.inc	2 Nov 2009 22:01:27 -0000	1.1.6.1
+++ modules/user/views_handler_argument_user_uid.inc	6 Feb 2010 18:23:34 -0000
@@ -12,7 +12,7 @@
   /**
    * Override the behavior of title(). Get the name of the user.
    */
-  function title_query() {
+  public function title_query() {
     if (!$this->argument) {
       return array(variable_get('anonymous', t('Anonymous')));
     }
Index: modules/user/views_plugin_argument_default_current_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_plugin_argument_default_current_user.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_plugin_argument_default_current_user.inc
--- modules/user/views_plugin_argument_default_current_user.inc	28 Jan 2010 22:44:36 -0000	1.1.6.1
+++ modules/user/views_plugin_argument_default_current_user.inc	6 Feb 2010 18:23:34 -0000
@@ -11,7 +11,7 @@
  * This plugin actually has no options so it odes not need to do a great deal.
  */
 class views_plugin_argument_default_current_user extends views_plugin_argument_default {
-  function get_argument() {
+  public function get_argument() {
     global $user;
     return $user->uid;
   }
Index: modules/user/views_plugin_argument_default_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_plugin_argument_default_user.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_plugin_argument_default_user.inc
--- modules/user/views_plugin_argument_default_user.inc	28 Jan 2010 22:44:36 -0000	1.1.6.1
+++ modules/user/views_plugin_argument_default_user.inc	6 Feb 2010 18:23:34 -0000
@@ -9,14 +9,14 @@
  * Default argument plugin to extract a user via menu_get_object
  */
 class views_plugin_argument_default_user extends views_plugin_argument_default {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['user'] = array('default' => '');
 
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['user'] = array(
       '#type' => 'textfield',
       '#title' => t('Default argument'),
@@ -24,13 +24,13 @@
     );
   }
 
-  function convert_options(&$options) {
+  public function convert_options(&$options) {
     if (!isset($options['user']) && isset($this->argument->options['default_argument_user'])) {
       $options['user'] = $this->argument->options['default_argument_user'];
     }
   }
 
-  function get_argument() {
+  public function get_argument() {
     foreach (range(1, 3) as $i) {
       $user = menu_get_object('user', $i);
       if (!empty($user)) {
Index: modules/user/views_handler_field_user_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/user/views_handler_field_user_link.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_user_link.inc
--- modules/user/views_handler_field_user_link.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/user/views_handler_field_user_link.inc	6 Feb 2010 18:23:34 -0000
@@ -4,18 +4,18 @@
  * Field handler to present a link to the user.
  */
 class views_handler_field_user_link extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['uid'] = 'uid';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['text'] = array('default' => '', 'translatable' => TRUE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['text'] = array(
       '#type' => 'textfield',
@@ -25,16 +25,16 @@
   }
 
   // An example of field level access control.
-  function access() {
+  public function access() {
     return user_access('access user profiles');
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
     $uid = $values->{$this->aliases['uid']};
     return l($text, "user/$uid");
Index: modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_filter_term_node_tid_depth.inc
--- modules/taxonomy/views_handler_filter_term_node_tid_depth.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/taxonomy/views_handler_filter_term_node_tid_depth.inc	6 Feb 2010 18:23:34 -0000
@@ -7,13 +7,13 @@
  * because it uses a subquery to find nodes with
  */
 class views_handler_filter_term_node_tid_depth extends views_handler_filter_term_node_tid {
-  function operator_options() {
+  public function operator_options() {
     return array(
       'or' => t('Is one of'),
     );
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['depth'] = array('default' => 0);
@@ -21,7 +21,7 @@
     return $options;
   }
 
-  function extra_options_form(&$form, &$form_state) {
+  public function extra_options_form(&$form, &$form_state) {
     parent::extra_options_form($form, $form_state);
 
     $form['depth'] = array(
@@ -32,7 +32,7 @@
     );
   }
 
-  function query() {
+  public function query() {
     // If no filter values are present, then do nothing.
     if (count($this->value) == 0) {
       return;
Index: modules/taxonomy/views_handler_argument_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_taxonomy.inc
--- modules/taxonomy/views_handler_argument_taxonomy.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/taxonomy/views_handler_argument_taxonomy.inc	6 Feb 2010 18:23:34 -0000
@@ -9,7 +9,7 @@
   /**
    * Override the behavior of title(). Get the title of the node.
    */
-  function title() {
+  public function title() {
     $term = taxonomy_term_load($this->argument);
     if (!empty($term)) {
       return check_plain($term->name);
Index: modules/taxonomy/views_handler_field_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc,v
retrieving revision 1.3
diff -u -r1.3 views_handler_field_taxonomy.inc
--- modules/taxonomy/views_handler_field_taxonomy.inc	30 Jan 2009 00:01:42 -0000	1.3
+++ modules/taxonomy/views_handler_field_taxonomy.inc	6 Feb 2010 18:23:34 -0000
@@ -12,13 +12,13 @@
    * This constructer assumes the term_data table. If using another
    * table, we'll need to be more specific.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['vid'] = 'vid';
     $this->additional_fields['tid'] = 'tid';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_taxonomy'] = array('default' => FALSE);
     return $options;
@@ -27,7 +27,7 @@
   /**
    * Provide link to taxonomy option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_taxonomy'] = array(
       '#title' => t('Link this field to its taxonomy term page'),
@@ -42,7 +42,7 @@
    *
    * Data should be made XSS safe prior to calling this function.
    */
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_taxonomy']) && !empty($values->{$this->aliases['tid']}) && $data !== NULL && $data !== '') {
       $term = new stdClass();
       $term->tid = $values->{$this->aliases['tid']};
@@ -53,7 +53,7 @@
     return $data;
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 }
Index: modules/taxonomy/views_handler_filter_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc,v
retrieving revision 1.8.6.2
diff -u -r1.8.6.2 views_handler_filter_term_node_tid.inc
--- modules/taxonomy/views_handler_filter_term_node_tid.inc	29 Jan 2010 00:14:42 -0000	1.8.6.2
+++ modules/taxonomy/views_handler_filter_term_node_tid.inc	6 Feb 2010 18:23:34 -0000
@@ -5,11 +5,11 @@
  * Filter by term id
  */
 class views_handler_filter_term_node_tid extends views_handler_filter_many_to_one {
-  function has_extra_options() { return TRUE; }
+  public function has_extra_options() { return TRUE; }
 
-  function get_value_options() { /* don't overwrite the value options */ }
+  public function get_value_options() { /* don't overwrite the value options */ }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['type'] = array('default' => 'textfield');
@@ -20,7 +20,7 @@
     return $options;
   }
 
-  function extra_options_form(&$form, &$form_state) {
+  public function extra_options_form(&$form, &$form_state) {
     $vocabularies = taxonomy_get_vocabularies();
     foreach ($vocabularies as $voc) {
       $options[$voc->vid] = check_plain($voc->name);
@@ -68,7 +68,7 @@
     );
   }
 
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     $vocabulary = taxonomy_vocabulary_load($this->options['vid']);
     if (empty($vocabulary) && $this->options['limit']) {
       $form['markup'] = array(
@@ -174,7 +174,7 @@
     }
   }
 
-  function value_validate(&$form, &$form_state) {
+  public function value_validate(&$form, &$form_state) {
     // We only validate if they've chosen the text field style.
     if ($this->options['type'] != 'textfield') {
       return;
@@ -188,7 +188,7 @@
     }
   }
 
-  function accept_exposed_input($input) {
+  public function accept_exposed_input($input) {
     if (empty($this->options['exposed'])) {
       return TRUE;
     }
@@ -209,7 +209,7 @@
     return $rc;
   }
 
-  function exposed_validate(&$form, &$form_state) {
+  public function exposed_validate(&$form, &$form_state) {
     if (empty($this->options['exposed'])) {
       return;
     }
@@ -241,7 +241,7 @@
    * or the exposed filter, this is abstracted out a bit so it can
    * handle the multiple input sources.
    */
-  function validate_term_strings(&$form, $values) {
+  public function validate_term_strings(&$form, $values) {
     if (empty($values)) {
       return array();
     }
@@ -277,18 +277,18 @@
     return $tids;
   }
 
-  function value_submit($form, &$form_state) {
+  public function value_submit($form, &$form_state) {
     // prevent array_filter from messing up our arrays in parent submit.
   }
 
-  function expose_form_right(&$form, &$form_state) {
+  public function expose_form_right(&$form, &$form_state) {
     parent::expose_form_right($form, $form_state);
     if ($this->options['type'] != 'select') {
       unset($form['expose']['reduce']);
     }
   }
 
-  function admin_summary() {
+  public function admin_summary() {
     // set up $this->value_options for the parent summary
     $this->value_options = array();
 
Index: modules/taxonomy/views_handler_argument_vocabulary_vid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_vocabulary_vid.inc
--- modules/taxonomy/views_handler_argument_vocabulary_vid.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/taxonomy/views_handler_argument_vocabulary_vid.inc	6 Feb 2010 18:23:34 -0000
@@ -8,7 +8,7 @@
   /**
    * Override the behavior of title(). Get the name of the user.
    */
-  function title() {
+  public function title() {
     $title = db_query("SELECT v.name FROM {taxonomy_vocabulary} v WHERE v.vid = :vid", array(':vid' => $this->argument))->fetchField();
 
     if (empty($title)) {
Index: modules/taxonomy/views_handler_argument_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_handler_argument_term_node_tid.inc
--- modules/taxonomy/views_handler_argument_term_node_tid.inc	24 Dec 2009 00:37:01 -0000	1.1.6.2
+++ modules/taxonomy/views_handler_argument_term_node_tid.inc	6 Feb 2010 18:23:34 -0000
@@ -4,14 +4,14 @@
  * Allow taxonomy term ID(s) as argument
  */
 class views_handler_argument_term_node_tid extends views_handler_argument_many_to_one {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['set_breadcrumb'] = array('default' => FALSE);
     $options['use_synonym_for_summary_links'] = array('default' => FALSE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['set_breadcrumb'] = array(
       '#type' => 'checkbox',
@@ -27,7 +27,7 @@
     );
   }
 
-  function set_breadcrumb(&$breadcrumb) {
+  public function set_breadcrumb(&$breadcrumb) {
     if (empty($this->options['set_breadcrumb']) || !is_numeric($this->argument)) {
       return;
     }
@@ -35,7 +35,7 @@
     return views_taxonomy_set_breadcrumb($breadcrumb, $this);
   }
 
-  function title_query() {
+  public function title_query() {
     $titles = array();
 
     $result = db_query("SELECT name FROM {taxonomy_term_data} WHERE tid IN (:tids)", array(':tids' => $this->value));
@@ -45,7 +45,7 @@
     return $titles;
   }
 
-  function summary_argument($data) {
+  public function summary_argument($data) {
     if (!empty($this->options['use_synonym_for_summary_links'])) {
       $synonym = db_result(db_query_range("SELECT name FROM {term_synonym} WHERE tid = %d", $data->{$this->base_alias}, 0, 1));
       if (!empty($synonym)) {
Index: modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc,v
retrieving revision 1.6.4.2
diff -u -r1.6.4.2 views_plugin_argument_validate_taxonomy_term.inc
--- modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc	28 Jan 2010 22:44:36 -0000	1.6.4.2
+++ modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc	6 Feb 2010 18:23:34 -0000
@@ -9,7 +9,7 @@
  * Validate whether an argument is an acceptable node.
  */
 class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument_validate {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['vids'] = array('default' => array());
     $options['type'] = array('default' => 'tid');
@@ -18,7 +18,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $vocabularies = taxonomy_get_vocabularies();
     $options = array();
     foreach ($vocabularies as $voc) {
@@ -55,12 +55,12 @@
     );
   }
 
-  function options_submit(&$form, &$form_state, &$options) {
+  public function options_submit(&$form, &$form_state, &$options) {
     // filter trash out of the options so we don't store giant unnecessary arrays
     $options['vids'] = array_filter($options['vids']);
   }
 
-  function convert_options(&$options) {
+  public function convert_options(&$options) {
     if (!isset($options['vids']) && !empty($this->argument->options['validate_argument_vocabulary'])) {
       $options['vids'] = $this->argument->options['validate_argument_vocabulary'];
       $options['type'] = $this->argument->options['validate_argument_type'];
@@ -68,7 +68,7 @@
     }
   }
 
-  function validate_argument($argument) {
+  public function validate_argument($argument) {
     $vids = $this->options['vids'];
     $type = $this->options['type'];
     $transform = $this->options['transform'];
Index: modules/taxonomy/views_handler_filter_vocabulary_vid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 views_handler_filter_vocabulary_vid.inc
--- modules/taxonomy/views_handler_filter_vocabulary_vid.inc	2 Nov 2009 22:01:26 -0000	1.3.4.1
+++ modules/taxonomy/views_handler_filter_vocabulary_vid.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Filter by vocabulary id
  */
 class views_handler_filter_vocabulary_vid extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (isset($this->value_options)) {
       return;
     }
Index: modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 views_handler_argument_term_node_tid_depth.inc
--- modules/taxonomy/views_handler_argument_term_node_tid_depth.inc	2 Nov 2009 22:01:26 -0000	1.3.4.1
+++ modules/taxonomy/views_handler_argument_term_node_tid_depth.inc	6 Feb 2010 18:23:34 -0000
@@ -7,7 +7,7 @@
  * because it uses a subquery to find nodes with
  */
 class views_handler_argument_term_node_tid_depth extends views_handler_argument {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['depth'] = array('default' => 0);
@@ -17,7 +17,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['depth'] = array(
       '#type' => 'weight',
@@ -41,7 +41,7 @@
     );
   }
 
-  function set_breadcrumb(&$breadcrumb) {
+  public function set_breadcrumb(&$breadcrumb) {
     if (empty($this->options['set_breadcrumb']) || !is_numeric($this->argument)) {
       return;
     }
@@ -52,7 +52,7 @@
   /**
    * Override default_actions() to remove summary actions.
    */
-  function default_actions($which = NULL) {
+  public function default_actions($which = NULL) {
     if ($which) {
       if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) {
         return parent::default_actions($which);
@@ -65,7 +65,7 @@
     return $actions;
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     if (!empty($this->options['break_phrase'])) {
@@ -116,7 +116,7 @@
     $this->query->add_where(0, "$this->table_alias.$this->real_field", $subquery, 'IN');
   }
 
-  function title() {
+  public function title() {
     $term = taxonomy_term_load($this->argument);
     if (!empty($term)) {
       return check_plain($term->name);
Index: modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_argument_term_node_tid_depth_modifier.inc
--- modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc	6 Feb 2010 18:23:34 -0000
@@ -8,9 +8,9 @@
  * because it uses a subquery to find nodes with
  */
 class views_handler_argument_term_node_tid_depth_modifier extends views_handler_argument {
-  function options_form(&$form, &$form_state) { }
-  function query() { }
-  function pre_query() {
+  public function options_form(&$form, &$form_state) { }
+  public function query() { }
+  public function pre_query() {
     // We don't know our argument yet, but it's based upon our position:
     $argument = isset($this->view->args[$this->position]) ? $this->view->args[$this->position] : NULL;
     if (!is_numeric($argument)) {
Index: modules/taxonomy/views_handler_relationship_node_term_data.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 views_handler_relationship_node_term_data.inc
--- modules/taxonomy/views_handler_relationship_node_term_data.inc	2 Nov 2009 22:01:26 -0000	1.3.4.1
+++ modules/taxonomy/views_handler_relationship_node_term_data.inc	6 Feb 2010 18:23:34 -0000
@@ -6,7 +6,7 @@
  */
 
 class views_handler_relationship_node_term_data extends views_handler_relationship  {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['vids'] = array('default' => array());
     return $options;
@@ -16,7 +16,7 @@
    * Default options form that provides the label widget that all fields
    * should have.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $vocabularies = taxonomy_get_vocabularies();
     $options = array();
@@ -36,7 +36,7 @@
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     $def = $this->definition;
Index: modules/taxonomy/views_handler_field_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc,v
retrieving revision 1.4.4.2
diff -u -r1.4.4.2 views_handler_field_term_node_tid.inc
--- modules/taxonomy/views_handler_field_term_node_tid.inc	28 Nov 2009 09:21:38 -0000	1.4.4.2
+++ modules/taxonomy/views_handler_field_term_node_tid.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Field handler for terms.
  */
 class views_handler_field_term_node_tid extends views_handler_field_prerender_list {
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
     if ($view->base_table == 'node_revisions') {
       $this->additional_fields['vid'] = array('table' => 'node_revisions', 'field' => 'vid');
@@ -15,7 +15,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['link_to_taxonomy'] = array('default' => TRUE);
@@ -28,7 +28,7 @@
   /**
    * Provide "link to term" option.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_taxonomy'] = array(
       '#title' => t('Link this field to its term page'),
@@ -63,11 +63,11 @@
   /**
    * Add this term to the query
    */
-  function query() {
+  public function query() {
     $this->add_additional_fields();
   }
 
-  function pre_render($values) {
+  public function pre_render($values) {
     $this->field_alias = $this->aliases['vid'];
     $vids = array();
     foreach ($values as $result) {
@@ -98,18 +98,18 @@
     }
   }
 
-  function render_item($count, $item) {
+  public function render_item($count, $item) {
     return $item['name'];
   }
 
-  function document_self_tokens(&$tokens) {
+  public function document_self_tokens(&$tokens) {
     $tokens['[' . $this->options['id'] . '-tid' . ']'] = t('The taxonomy term ID for the term.');
     $tokens['[' . $this->options['id'] . '-name' . ']'] = t('The taxonomy term name for the term.');
     $tokens['[' . $this->options['id'] . '-vid' . ']'] = t('The vocabulary ID for the vocabulary the term belongs to.');
     $tokens['[' . $this->options['id'] . '-vocabulary' . ']'] = t('The name for the vocabulary the term belongs to.');
   }
 
-  function add_self_tokens(&$tokens, $item) {
+  public function add_self_tokens(&$tokens, $item) {
     $tokens['[' . $this->options['id'] . '-tid' . ']'] = $item['tid'];
     $tokens['[' . $this->options['id'] . '-name' . ']'] = $item['name'];
     $tokens['[' . $this->options['id'] . '-vid' . ']'] = $item['vid'];
Index: plugins/views_plugin_pager_full.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_pager_full.inc,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 views_plugin_pager_full.inc
--- plugins/views_plugin_pager_full.inc	6 Feb 2010 14:17:10 -0000	1.1.4.3
+++ plugins/views_plugin_pager_full.inc	6 Feb 2010 18:23:35 -0000
@@ -7,14 +7,14 @@
  * @ingroup views_pager_plugins
  */
 class views_plugin_pager_full extends views_plugin_pager {
-  function summary_title() {
+  public function summary_title() {
     if (!empty($this->options['offset'])) {
       return format_plural($this->options['items_per_page'], 'Paged, @count item, skip @skip', 'Paged, @count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']));
     }
       return format_plural($this->options['items_per_page'], 'Paged, @count item', 'Paged, @count items', array('@count' => $this->options['items_per_page']));
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['items_per_page'] = array('default' => 10);
     $options['offset'] = array('default' => 0);
@@ -27,7 +27,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['items_per_page'] = array(
       '#title' => t('Items per page'),
       '#type' => 'textfield',
@@ -57,7 +57,7 @@
     );
   }
 
-  function query() {
+  public function query() {
     $limit = $this->options['items_per_page'];
     $offset = $this->current_page * $this->options['items_per_page'] + $this->options['offset'];
     if (!empty($this->options['total_pages'])) {
@@ -71,7 +71,7 @@
     $this->view->query->set_offset($offset);
   }
 
-  function render($input) {
+  public function render($input) {
     $pager_theme = views_theme_functions('pager', $this->view, $this->display);
     $output = theme($pager_theme, array(
       'tags' => $input, 'quantity' => $this->options['items_per_page'], 'element' => $this->options['id']));
@@ -85,7 +85,7 @@
    *   If provided, the page number will be set to this. If NOT provided,
    *   the page number will be set from the global page array.
    */
-  function set_current_page($number = NULL) {
+  public function set_current_page($number = NULL) {
     if (isset($number)) {
       $this->current_page = $number;
       return;
@@ -110,7 +110,7 @@
    * items available and to update the current page if the requested
    * page is out of range.
    */
-  function update_page_info() {
+  public function update_page_info() {
     if (!empty($this->options['total_pages'])) {
       if (($this->options['total_pages'] * $this->options['items_per_page']) < $this->total_items) {
         $this->total_items = $this->options['total_pages'] * $this->options['items_per_page'];
Index: plugins/views_plugin_argument_validate.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_argument_validate.inc,v
retrieving revision 1.2.4.2
diff -u -r1.2.4.2 views_plugin_argument_validate.inc
--- plugins/views_plugin_argument_validate.inc	28 Jan 2010 22:44:37 -0000	1.2.4.2
+++ plugins/views_plugin_argument_validate.inc	6 Feb 2010 18:23:34 -0000
@@ -25,7 +25,7 @@
    * Initialize this plugin with the view and the argument
    * it is linked to.
    */
-  function init(&$view, &$argument, $options) {
+  public function init(&$view, &$argument, $options) {
     $this->view = &$view;
     $this->argument = &$argument;
 
@@ -37,22 +37,22 @@
    * Retrieve the options when this is a new access
    * control plugin
    */
-  function option_definition() { return array(); }
+  public function option_definition() { return array(); }
 
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) { }
+  public function options_form(&$form, &$form_state) { }
 
   /**
    * Provide the default form form for validating options
    */
-  function options_validate(&$form, &$form_state) { }
+  public function options_validate(&$form, &$form_state) { }
 
   /**
    * Provide the default form form for submitting options
    */
-  function options_submit(&$form, &$form_state) { }
+  public function options_submit(&$form, &$form_state) { }
 
   /**
    * Convert options from the older style.
@@ -62,12 +62,12 @@
    * move arguments from the old style to the new style. See
    * views_plugin_argument_default_fixed for a good example of this method.
    */
-  function convert_options(&$options) { }
+  public function convert_options(&$options) { }
 
   /**
    * Determine if the administrator has the privileges to use this plugin
    */
-  function access() { return TRUE; }
+  public function access() { return TRUE; }
 
   /**
    * If we don't have access to the form but are showing it anyway, ensure that
@@ -76,7 +76,7 @@
    * This is only called by child objects if specified in the options_form(),
    * so it will not always be used.
    */
-  function check_access(&$form, $option_name) {
+  public function check_access(&$form, $option_name) {
     if (!$this->access()) {
       $form[$option_name]['#disabled'] = TRUE;
       $form[$option_name]['#value'] = $form[$this->option_name]['#default_value'];
@@ -84,7 +84,7 @@
     }
   }
 
-  function validate_argument($arg) { return TRUE; }
+  public function validate_argument($arg) { return TRUE; }
 }
 
 /**
Index: plugins/views_plugin_style.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style.inc,v
retrieving revision 1.8.4.2
diff -u -r1.8.4.2 views_plugin_style.inc
--- plugins/views_plugin_style.inc	30 Nov 2009 19:21:54 -0000	1.8.4.2
+++ plugins/views_plugin_style.inc	6 Feb 2010 18:23:35 -0000
@@ -28,7 +28,7 @@
    *   The style options might come externally as the style can be sourced
    *   from at least two locations. If it's not included, look on the display.
    */
-  function init(&$view, &$display, $options = NULL) {
+  public function init(&$view, &$display, $options = NULL) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -48,7 +48,7 @@
     );
   }
 
-  function destroy() {
+  public function destroy() {
     parent::destroy();
 
     if (isset($this->row_plugin)) {
@@ -59,14 +59,14 @@
   /**
    * Return TRUE if this style also uses a row plugin.
    */
-  function uses_row_plugin() {
+  public function uses_row_plugin() {
     return !empty($this->definition['uses row plugin']);
   }
 
   /**
    * Return TRUE if this style also uses fields.
    */
-  function uses_fields() {
+  public function uses_fields() {
     // If we use a row plugin, ask the row plugin. Chances are, we don't
     // care, it does.
     if ($this->uses_row_plugin() && !empty($this->row_plugin)) {
@@ -76,13 +76,13 @@
     return !empty($this->definition['uses fields']);
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['grouping'] = array('default' => '');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     // Only fields-based views can handle grouping.  Style plugins can also exclude
     // themselves from being groupable by setting their "use grouping" definiton
     // key to FALSE.
@@ -117,13 +117,13 @@
    * interfere with the sorts. If so it should build; if it returns
    * any non-TRUE value, normal sorting will NOT be added to the query.
    */
-  function build_sort() { return TRUE; }
+  public function build_sort() { return TRUE; }
 
   /**
    * Called by the view builder to let the style build a second set of
    * sorts that will come after any other sorts in the view.
    */
-  function build_sort_post() { }
+  public function build_sort_post() { }
 
   /**
    * Allow the style to do stuff before each row is rendered.
@@ -131,7 +131,7 @@
    * @param $result
    *   The full array of results from the query.
    */
-  function pre_render($result) {
+  public function pre_render($result) {
     if (!empty($this->row_plugin)) {
       $this->row_plugin->pre_render($result);
     }
@@ -140,7 +140,7 @@
   /**
    * Render the display in this style.
    */
-  function render() {
+  public function render() {
     if ($this->uses_row_plugin() && empty($this->row_plugin)) {
       debug('views_plugin_style_default: Missing row plugin');
       return;
@@ -187,7 +187,7 @@
    * @return
    *   The grouped record set.
    */
-  function render_grouping($records, $grouping_field = '') {
+  public function render_grouping($records, $grouping_field = '') {
     $sets = array();
     if ($grouping_field) {
       $this->view->row_index = 0;
@@ -214,7 +214,7 @@
     return $sets;
   }
 
-  function validate() {
+  public function validate() {
     $errors = parent::validate();
 
     if ($this->uses_row_plugin()) {
@@ -226,7 +226,7 @@
     return $errors;
   }
 
-  function query() {
+  public function query() {
     parent::query();
     if (isset($this->row_plugin)) {
       $this->row_plugin->query();
Index: plugins/views_plugin_query_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_query_default.inc,v
retrieving revision 1.1.4.14
diff -u -r1.1.4.14 views_plugin_query_default.inc
--- plugins/views_plugin_query_default.inc	6 Feb 2010 16:38:11 -0000	1.1.4.14
+++ plugins/views_plugin_query_default.inc	6 Feb 2010 18:23:35 -0000
@@ -14,71 +14,71 @@
   /**
    * A list of tables in the order they should be added, keyed by alias.
    */
-  var $table_queue = array();
+  public $table_queue = array();
 
   /**
    * Holds an array of tables and counts added so that we can create aliases
    */
-  var $tables = array();
+  public $tables = array();
 
   /**
    * Holds an array of relationships, which are aliases of the primary
    * table that represent different ways to join the same table in.
    */
-  var $relationships = array();
+  public $relationships = array();
 
   /**
    * An array of sections of the WHERE query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
    */
-  var $where = array();
+  public $where = array();
   /**
    * An array of sections of the HAVING query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
    */
-  var $having = array();
+  public $having = array();
   /**
    * The default operator to use when connecting the WHERE groups. May be
    * AND or OR.
    */
-  var $group_operator = 'AND';
+  public $group_operator = 'AND';
 
   /**
    * A simple array of order by clauses.
    */
-  var $orderby = array();
+  public $orderby = array();
 
   /**
    * A simple array of group by clauses.
    */
-  var $groupby = array();
+  public $groupby = array();
 
   /**
    * The table header to use for tablesort. This matters because tablesort
    * needs to modify the query and needs the header.
    */
-  var $header = array();
+  public $header = array();
 
   /**
    * A flag as to whether or not to make the primary field distinct.
    */
-  var $distinct = FALSE;
+  public $distinct = FALSE;
 
-  var $placeholder_counter = 0;
+  public $placeholder_counter = 0;
 
-  var $has_aggregate = FALSE;
+  public $has_aggregate = FALSE;
 
   /**
    * Should this query be optimized for counts, for example no sorts.
    */
-  var $get_count_optimized = NULL;
+  public $get_count_optimized = NULL;
 
   /**
    * Constructor; Create the basic query object and fill with default values.
    */
-  function init($base_table = 'node', $base_field = 'nid') {
+  public function init($base_table = 'node', $base_field = 'nid') {
     $this->base_table = $base_table;  // Predefine these above, for clarity.
     $this->base_field = $base_field;
     $this->relationships[$base_table] = array(
@@ -127,7 +127,7 @@
   /**
    * Set the base field to be distinct.
    */
-  function set_distinct($value = TRUE) {
+  public function set_distinct($value = TRUE) {
     if (!(isset($this->no_distinct) && $value)) {
       $this->distinct = $value;
     }
@@ -136,7 +136,7 @@
   /**
    * Set what field the query will count() on for paging.
    */
-  function set_count_field($table, $field, $alias = NULL) {
+  public function set_count_field($table, $field, $alias = NULL) {
     if (empty($alias)) {
       $alias = $table . '_' . $field;
     }
@@ -152,7 +152,7 @@
    * Set the table header; used for click-sorting because it's needed
    * info to modify the ORDER BY clause.
    */
-  function set_header($header) {
+  public function set_header($header) {
     $this->header = $header;
   }
 
@@ -187,7 +187,7 @@
    *   might have a relationship to an 'album' node, which might
    *   have a relationship to an 'artist' node.
    */
-  function add_relationship($alias, $join, $base, $link_point = NULL) {
+  public function add_relationship($alias, $join, $base, $link_point = NULL) {
     if (empty($link_point)) {
       $link_point = $this->base_table;
     }
@@ -261,7 +261,7 @@
    *   adding parts to the query. Or FALSE if the table was not able to be
    *   added.
    */
-  function add_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
+  public function add_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
     if (!$this->ensure_path($table, $relationship, $join)) {
       return FALSE;
     }
@@ -296,7 +296,7 @@
    *   adding parts to the query. Or FALSE if the table was not able to be
    *   added.
    */
-  function queue_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
+  public function queue_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
     // If the alias is set, make sure it doesn't already exist.
     if (isset($this->table_queue[$alias])) {
       return $alias;
@@ -359,7 +359,7 @@
     return $alias;
   }
 
-  function mark_table($table, $relationship, $alias) {
+  public function mark_table($table, $relationship, $alias) {
     // Mark that this table has been added.
     if (empty($this->tables[$relationship][$table])) {
       if (!isset($alias)) {
@@ -401,7 +401,7 @@
    *   The alias used to refer to this specific table, or NULL if the table
    *   cannot be ensured.
    */
-  function ensure_table($table, $relationship = NULL, $join = NULL) {
+  public function ensure_table($table, $relationship = NULL, $join = NULL) {
     // ensure a relationship
     if (empty($relationship)) {
       $relationship = $this->base_table;
@@ -480,7 +480,7 @@
    * query they will be added, but additional copies will NOT be added
    * if the table is already there.
    */
-  function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) {
+  public function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) {
     if (!isset($relationship)) {
       $relationship = $this->base_table;
     }
@@ -532,7 +532,7 @@
    * Fix a join to adhere to the proper relationship; the left table can vary
    * based upon what relationship items are joined in on.
    */
-  function adjust_join($join, $relationship) {
+  public function adjust_join($join, $relationship) {
     if (!empty($join->adjusted)) {
       return $join;
     }
@@ -585,7 +585,7 @@
    * @return
    *   A views_join object or child object, if one exists.
    */
-  function get_join_data($table, $base_table) {
+  public function get_join_data($table, $base_table) {
     // Check to see if we're linking to a known alias. If so, get the real
     // table's data instead.
     if (!empty($this->table_queue[$table])) {
@@ -600,7 +600,7 @@
    * If you need the alias of a table with a particular relationship, use
    * ensure_table().
    */
-  function get_table_info($table) {
+  public function get_table_info($table) {
     if (!empty($this->table_queue[$table])) {
       return $this->table_queue[$table];
     }
@@ -636,7 +636,7 @@
    * @return $name
    *   The name that this field can be referred to as. Usually this is the alias.
    */
-  function add_field($table, $field, $alias = '', $params = array()) {
+  public function add_field($table, $field, $alias = '', $params = array()) {
     // We check for this specifically because it gets a special alias.
     if ($table == $this->base_table && $field == $this->base_field && empty($alias)) {
       $alias = $this->base_field;
@@ -686,7 +686,7 @@
    * Remove all fields that may've been added; primarily used for summary
    * mode where we're changing the query because we didn't get data we needed.
    */
-  function clear_fields() {
+  public function clear_fields() {
     $this->fields = array();
   }
 
@@ -704,7 +704,7 @@
    * @return $group
    *   The group ID generated.
    */
-  function set_where_group($type = 'AND', $group = NULL, $where = 'where') {
+  public function set_where_group($type = 'AND', $group = NULL, $where = 'where') {
     // Set an alias.
     $groups = &$this->$where;
 
@@ -741,7 +741,7 @@
    *   options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
    *   = otherwise.
    */
-  function add_where($group, $field, $value = NULL, $operator = NULL) {
+  public function add_where($group, $field, $value = NULL, $operator = NULL) {
     // Ensure all variants of 0 are actually 0. Thus '', 0 and NULL are all
     // the default group.
     if (empty($group)) {
@@ -780,7 +780,7 @@
    *   options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
    *   = otherwise.
    */
-  function add_having($group, $field, $value = NULL, $operator = NULL) {
+  public function add_having($group, $field, $value = NULL, $operator = NULL) {
     // Ensure all variants of 0 are actually 0. Thus '', 0 and NULL are all
     // the default group.
     if (empty($group)) {
@@ -818,7 +818,7 @@
    * @param $params
    *   Any params that should be passed through to the add_field.
    */
-  function add_orderby($table, $field, $order, $alias = '', $params = array()) {
+  public function add_orderby($table, $field, $order, $alias = '', $params = array()) {
     if ($table) {
       $this->ensure_table($table);
     }
@@ -858,7 +858,7 @@
    * for ensuring that the fields are fully qualified and the table is properly
    * added.
    */
-  function add_groupby($clause) {
+  public function add_groupby($clause) {
     // Only add it if it's not already in there.
     if (!in_array($clause, $this->groupby)) {
       $this->groupby[] = $clause;
@@ -871,7 +871,7 @@
    * @param $where
    *   'where' or 'having'.
    */
-  function build_condition($where = 'where') {
+  public function build_condition($where = 'where') {
     $main_group = $this->group_operator == 'OR' ? db_or() : db_and();
     foreach ($this->$where as $group => $info) {
       $sub_group = $info['type'] == 'OR' ? db_or() : db_and();
@@ -886,7 +886,7 @@
   /**
    * Build fields array.
    */
-  function compile_fields($fields_array, $query) {
+  public function compile_fields($fields_array, $query) {
     $non_aggregates = array();
     foreach ($fields_array as $field) {
       $string = '';
@@ -956,7 +956,7 @@
    * @param $get_count
    *   Provide a countquery if this is true, otherwise provide a normal query.
    */
-  function query($get_count = FALSE) {
+  public function query($get_count = FALSE) {
     // Check query distinct value.
     if (empty($this->no_distinct) && $this->distinct && !empty($this->fields)) {
       $base_field_alias = $this->add_field($this->base_table, $this->base_field, NULL, array('distinct' => TRUE));
@@ -1033,7 +1033,7 @@
   /**
    * Get the arguments attached to the WHERE and HAVING clauses of this query.
    */
-  function get_where_args() {
+  public function get_where_args() {
     $args = array();
     foreach ($this->where as $group => $where) {
       $args = array_merge($args, $where['args']);
@@ -1047,7 +1047,7 @@
   /**
    * Let modules modify the query just prior to finalizing it.
    */
-  function alter(&$view) {
+  public function alter(&$view) {
     foreach (module_implements('views_query_alter') as $module) {
       $function = $module . '_views_query_alter';
       $function($view, $this);
@@ -1057,7 +1057,7 @@
   /**
    * Builds the necessary info to execute the query.
    */
-  function build(&$view) {
+  public function build(&$view) {
     $this->init_pager($view);
     if ($this->pager->use_pager()) {
       $this->pager->set_current_page($view->current_page);
@@ -1077,7 +1077,7 @@
    * Values to set: $view->result, $view->total_rows, $view->execute_time,
    * $view->current_page.
    */
-  function execute(&$view) {
+  public function execute(&$view) {
     $external = FALSE; // Whether this query will run against an external database.
     $query = $view->build_info['query'];
     $count_query = $view->build_info['count_query'];
@@ -1146,11 +1146,11 @@
     $view->execute_time = microtime(TRUE) - $start;
   }
 
-  function add_signature(&$view) {
+  public function add_signature(&$view) {
     $view->query->add_field(NULL, "'" . $view->name . ':' . $view->current_display . "'", 'view_name');
   }
 
-  function get_aggregation_info() {
+  public function get_aggregation_info() {
     // @todo -- need a way to get database specific and customized aggregation
     // functions into here.
     return array(
Index: plugins/views_plugin_access_role.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_access_role.inc,v
retrieving revision 1.2.6.2
diff -u -r1.2.6.2 views_plugin_access_role.inc
--- plugins/views_plugin_access_role.inc	13 Nov 2009 23:19:22 -0000	1.2.6.2
+++ plugins/views_plugin_access_role.inc	6 Feb 2010 18:23:34 -0000
@@ -5,17 +5,17 @@
  * Access plugin that provides role-based access control.
  */
 class views_plugin_access_role extends views_plugin_access {
-  function access($account) {
+  public function access($account) {
     $roles = array_keys($account->roles);
     $roles[] = $account->uid ? DRUPAL_AUTHENTICATED_RID : DRUPAL_ANONYMOUS_RID;
     return array_intersect(array_filter($this->options['role']), $roles);
   }
 
-  function get_access_callback() {
+  public function get_access_callback() {
     return array('views_check_roles', array(array_filter($this->options['role'])));
   }
 
-  function summary_title() {
+  public function summary_title() {
     $count = count($this->options['role']);
     if ($count < 1) {
       return t('No role(s) selected');
@@ -31,14 +31,14 @@
   }
 
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['role'] = array('default' => array());
 
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['role'] = array(
       '#type' => 'checkboxes',
       '#title' => t('Role'),
@@ -48,13 +48,13 @@
     );
   }
 
-  function options_validate(&$form, &$form_state) {
+  public function options_validate(&$form, &$form_state) {
     if (!array_filter($form_state['values']['access_options']['role'])) {
       form_error($form['role'], t('You must select at least one role if type is "by role"'));
     }
   }
 
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     // I hate checkboxes.
     $form_state['values']['access_options']['role'] = array_filter($form_state['values']['access_options']['role']);
   }
Index: plugins/views_plugin_cache_none.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_cache_none.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_plugin_cache_none.inc
--- plugins/views_plugin_cache_none.inc	2 Nov 2009 22:01:27 -0000	1.2.4.1
+++ plugins/views_plugin_cache_none.inc	6 Feb 2010 18:23:34 -0000
@@ -5,15 +5,15 @@
  * Caching plugin that provides no caching at all.
  */
 class views_plugin_cache_none extends views_plugin_cache {
-  function cache_start() { /* do nothing */ }
+  public function cache_start() { /* do nothing */ }
 
-  function summary_title() {
+  public function summary_title() {
     return t('None');
   }
 
-  function cache_get($type) {
+  public function cache_get($type) {
     return FALSE;
   }
 
-  function cache_set($type) { }
+  public function cache_set($type) { }
 }
Index: plugins/views_plugin_display_attachment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display_attachment.inc,v
retrieving revision 1.6.4.2
diff -u -r1.6.4.2 views_plugin_display_attachment.inc
--- plugins/views_plugin_display_attachment.inc	30 Nov 2009 19:05:39 -0000	1.6.4.2
+++ plugins/views_plugin_display_attachment.inc	6 Feb 2010 18:23:34 -0000
@@ -15,7 +15,7 @@
  * @ingroup views_display_plugins
  */
 class views_plugin_display_attachment extends views_plugin_display {
-  function option_definition () {
+  public function option_definition () {
     $options = parent::option_definition();
 
     $options['attachment_position'] = array('default' => 'before');
@@ -28,11 +28,11 @@
     return $options;
   }
 
-  function execute() {
+  public function execute() {
     return $this->view->render($this->display->id);
   }
 
-  function attachment_positions($position = NULL) {
+  public function attachment_positions($position = NULL) {
     $positions = array(
       'before' => t('Before'),
       'after' => t('After'),
@@ -51,7 +51,7 @@
    *
    * This output is returned as an array.
    */
-  function options_summary(&$categories, &$options) {
+  public function options_summary(&$categories, &$options) {
     // It is very important to call the parent function here:
     parent::options_summary($categories, $options);
 
@@ -114,7 +114,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_form($form, $form_state);
 
@@ -186,7 +186,7 @@
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
@@ -204,7 +204,7 @@
   /**
    * Attach to another view.
    */
-  function attach_to($display_id) {
+  public function attach_to($display_id) {
     $displays = $this->get_option('displays');
 
     if (empty($displays[$display_id])) {
@@ -253,7 +253,7 @@
    * they are set to inherit the exposed filter settings
    * of their parent display.
    */
-  function uses_exposed() {
+  public function uses_exposed() {
     if (!empty($this->options['inherit_exposed_filters']) && parent::uses_exposed()) {
       return TRUE;
     }
@@ -265,15 +265,15 @@
    * settings from its parent display, then don't render and
    * display a second set of exposed filter widgets.
    */
-  function displays_exposed() {
+  public function displays_exposed() {
     return $this->options['inherit_exposed_filters'] ? FALSE : TRUE;
   }
 
-  function use_pager() {
+  public function use_pager() {
     return !empty($this->use_pager);
   }
 
-  function render_pager() {
+  public function render_pager() {
     return !empty($this->use_pager) && $this->get_option('render_pager');
   }
 }
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.18
diff -u -r1.27.4.18 views_plugin_display.inc
--- plugins/views_plugin_display.inc	6 Feb 2010 14:21:01 -0000	1.27.4.18
+++ plugins/views_plugin_display.inc	6 Feb 2010 18:23:34 -0000
@@ -25,9 +25,9 @@
  * @ingroup views_display_plugins
  */
 class views_plugin_display extends views_plugin {
-  var $handlers = array();
+  public $handlers = array();
 
-  function init(&$view, &$display, $options = NULL) {
+  public function init(&$view, &$display, $options = NULL) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -44,7 +44,7 @@
 
     // Translate changed settings:
     // Check if any of the previous values now managed by
-    // pluggable pagers have been changed. 
+    // pluggable pagers have been changed.
     // If yes, perform the conversion
     $items_per_page = $this->get_option('items_per_page');
     $offset = $this->get_option('offset');
@@ -81,7 +81,7 @@
     }
   }
 
-  function destroy() {
+  public function destroy() {
     parent::destroy();
 
     foreach ($this->handlers as $type => $handlers) {
@@ -101,13 +101,13 @@
    * Determine if this display is the 'default' display which contains
    * fallback settings
    */
-  function is_default_display() { return FALSE; }
+  public function is_default_display() { return FALSE; }
 
   /**
    * Determine if this display uses exposed filters, so the view
    * will know whether or not to build them.
    */
-  function uses_exposed() {
+  public function uses_exposed() {
     if (!isset($this->has_exposed)) {
       foreach ($this->handlers as $type => $value) {
         foreach ($this->view->$type as $id => $handler) {
@@ -133,14 +133,14 @@
    * returns, exposed filters will not be used nor
    * displayed unless uses_exposed() returns TRUE.
    */
-  function displays_exposed() {
+  public function displays_exposed() {
     return TRUE;
   }
 
   /**
    * Does the display use AJAX?
    */
-  function use_ajax() {
+  public function use_ajax() {
     if (!empty($this->definition['use ajax'])) {
       return $this->get_option('use_ajax');
     }
@@ -150,7 +150,7 @@
   /**
    * Does the display have a pager enabled?
    */
-  function use_pager() {
+  public function use_pager() {
     $pager = $this->get_plugin('pager');
     if ($pager) {
       return $pager->use_pager();
@@ -160,7 +160,7 @@
   /**
    * Does the display have a more link enabled?
    */
-  function use_more() {
+  public function use_more() {
     if (!empty($this->definition['use more'])) {
       return $this->get_option('use_more');
     }
@@ -170,14 +170,14 @@
   /**
    * Does the display have a more link enabled?
    */
-  function use_group_by() {
+  public function use_group_by() {
     return $this->get_option('group_by');
   }
 
   /**
    * Should the enabled display more link be shown when no more items?
    */
-  function use_more_always() {
+  public function use_more_always() {
     if (!empty($this->definition['use more'])) {
       return $this->get_option('use_more_always');
     }
@@ -187,7 +187,7 @@
   /**
    * Does the display have custom link text?
    */
-  function use_more_text() {
+  public function use_more_text() {
     if (!empty($this->definition['use more'])) {
       return $this->get_option('use_more_text');
     }
@@ -197,20 +197,20 @@
   /**
    * Can this display accept attachments?
    */
-  function accept_attachments() {
+  public function accept_attachments() {
     return !empty($this->definition['accept attachments']);
   }
 
   /**
    * Allow displays to attach to other views.
    */
-  function attach_to($display_id) { }
+  public function attach_to($display_id) { }
 
   /**
    * Static member function to list which sections are defaultable
    * and what items each section contains.
    */
-  function defaultable_sections($section = NULL) {
+  public function defaultable_sections($section = NULL) {
     $sections = array(
       'access' => array('access'),
       'cache' => array('cache'),
@@ -257,7 +257,7 @@
    * displays spread their options out. We don't want to set defaults for
    * items that are normally defaulted elsewhere.
    */
-  function _set_option_defaults(&$storage, $options, $level = 0) {
+  public function _set_option_defaults(&$storage, $options, $level = 0) {
     foreach ($options as $option => $definition) {
       // If defaulted to elsewhere and we're not the default display, skip.
       if ($level == 0 && !$this->is_default_display() && !empty($options['defaults']['default'][$option])) {
@@ -274,7 +274,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = array(
       'defaults' => array(
         'default' => array(
@@ -484,7 +484,7 @@
    *
    * By default, displays do not have a path.
    */
-  function has_path() { return FALSE; }
+  public function has_path() { return FALSE; }
 
   /**
    * Check to see if the display has some need to link to another display.
@@ -493,13 +493,13 @@
    * sometimes displays that have a path might also need to link to another display.
    * This is true for feeds.
    */
-  function uses_link_display() { return !$this->has_path(); }
+  public function uses_link_display() { return !$this->has_path(); }
 
   /**
    * Check to see which display to use when creating links within
    * a view using this display.
    */
-  function get_link_display() {
+  public function get_link_display() {
     $display_id = $this->get_option('link_display');
     // If unknown, pick the first one.
     if (empty($display_id) || empty($this->view->display[$display_id])) {
@@ -521,7 +521,7 @@
    * This can be overridden for displays that do strange things
    * with the path.
    */
-  function get_path() {
+  public function get_path() {
     if ($this->has_path()) {
       return $this->get_option('path');
     }
@@ -537,7 +537,7 @@
    *
    * By default, displays do not need breadcrumbs
    */
-  function uses_breadcrumb() { return FALSE; }
+  public function uses_breadcrumb() { return FALSE; }
 
   /**
    * Determine if a given option is set to use the default display or the
@@ -546,7 +546,7 @@
    * @return
    *   TRUE for the default display
    */
-  function is_defaulted($option) {
+  public function is_defaulted($option) {
     return !$this->is_default_display() && !empty($this->default_display) && !empty($this->options['defaults'][$option]);
   }
 
@@ -554,7 +554,7 @@
    * Intelligently get an option either from this display or from the
    * default display, if directed to do so.
    */
-  function get_option($option) {
+  public function get_option($option) {
     if ($this->is_defaulted($option)) {
       return $this->default_display->get_option($option);
     }
@@ -567,7 +567,7 @@
   /**
    * Determine if the display's style uses fields.
    */
-  function uses_fields() {
+  public function uses_fields() {
     $plugin = $this->get_plugin();
     if ($plugin) {
       return $plugin->uses_fields();
@@ -577,7 +577,7 @@
   /**
    * Get the display or row plugin, if it exists.
    */
-  function get_plugin($type = 'style', $name = NULL) {
+  public function get_plugin($type = 'style', $name = NULL) {
     static $cache = array();
     if (!isset($cache[$type][$name])) {
       switch ($type) {
@@ -619,7 +619,7 @@
   /**
    * Get the handler object for a single handler.
    */
-  function &get_handler($type, $id) {
+  public function &get_handler($type, $id) {
     if (!isset($this->handlers[$type])) {
       $this->get_handlers($type);
     }
@@ -636,7 +636,7 @@
   /**
    * Get a full array of handlers for $type. This caches them.
    */
-  function get_handlers($type) {
+  public function get_handlers($type) {
     if (!isset($this->handlers[$type])) {
       $this->handlers[$type] = array();
       $types = views_object_types();
@@ -674,7 +674,7 @@
    * Intelligently set an option either from this display or from the
    * default display, if directed to do so.
    */
-  function set_option($option, $value) {
+  public function set_option($option, $value) {
     if ($this->is_defaulted($option)) {
       return $this->default_display->set_option($option, $value);
     }
@@ -689,7 +689,7 @@
   /**
    * Set an option and force it to be an override.
    */
-  function override_option($option, $value) {
+  public function override_option($option, $value) {
     $this->set_override($option, FALSE);
     $this->set_option($option, $value);
   }
@@ -698,7 +698,7 @@
    * Because forms may be split up into sections, this provides
    * an easy URL to exactly the right section. Don't override this.
    */
-  function option_link($text, $section, $class = '', $title = '') {
+  public function option_link($text, $section, $class = '', $title = '') {
     views_add_js('ajax');
     if (!empty($class)) {
       $text = '<span>' . $text . '</span>';
@@ -720,7 +720,7 @@
    *
    * This output is returned as an array.
    */
-  function options_summary(&$categories, &$options) {
+  public function options_summary(&$categories, &$options) {
     $categories = array(
       'basic' => array(
         'title' => t('Basic settings'),
@@ -983,7 +983,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     if ($this->defaultable_sections($form_state['section'])) {
       $this->add_override_button($form, $form_state, $form_state['section']);
     }
@@ -1578,7 +1578,7 @@
   /**
    * Format a list of theme templates for output by the theme info helper.
    */
-  function format_themes($themes) {
+  public function format_themes($themes) {
     $registry = theme_get_registry();
 
     // Run through the theme engine variables, if necessary
@@ -1615,7 +1615,7 @@
   /**
    * Validate the options form.
    */
-  function options_validate(&$form, &$form_state) {
+  public function options_validate(&$form, &$form_state) {
     switch ($form_state['section']) {
       case 'display_id':
         if ($form_state['values']['display_id']) {
@@ -1666,7 +1666,7 @@
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     // Not sure I like this being here, but it seems (?) like a logical place.
     $cache_plugin = $this->get_plugin('cache');
     if ($cache_plugin) {
@@ -1850,7 +1850,7 @@
    * change whether this info is stored on the default display or on
    * the current display.
    */
-  function add_override_button(&$form, &$form_state, $section) {
+  public function add_override_button(&$form, &$form_state, $section) {
     if ($this->is_default_display()) {
       return;
     }
@@ -1896,14 +1896,14 @@
   /**
    * If override/revert was clicked, perform the proper toggle.
    */
-  function options_override($form, &$form_state) {
+  public function options_override($form, &$form_state) {
     $this->set_override($form_state['section']);
   }
 
   /**
    * Flip the override setting for the given section.
    */
-  function set_override($section, $new_state = NULL) {
+  public function set_override($section, $new_state = NULL) {
     $options = $this->defaultable_sections($section);
     if (!$options) {
       return;
@@ -1933,7 +1933,7 @@
   /**
    * Inject anything into the query that the display handler needs.
    */
-  function query() {
+  public function query() {
     // Make the query distinct if the option was set.
     if ($this->get_option('distinct')) {
       $this->view->query->set_distinct();
@@ -1943,12 +1943,12 @@
   /**
    * Not all display plugins will support filtering
    */
-  function render_filters() { }
+  public function render_filters() { }
 
   /**
    * Render the 'more' link
    */
-  function render_more_link() {
+  public function render_more_link() {
     if ($this->use_more() && ($this->use_more_always() || $this->view->query->pager->has_more_records())) {
       $path = $this->get_path();
       if ($path) {
@@ -1968,7 +1968,7 @@
   /**
    * Render a text area, using the proper format.
    */
-  function render_textarea($area) {
+  public function render_textarea($area) {
     static $formats = array();
 
     $value = $this->get_option($area);
@@ -1994,7 +1994,7 @@
   /**
    * Render the header of the view.
    */
-  function render_header() {
+  public function render_header() {
     if (!empty($this->view->result) || $this->get_option('header_empty')) {
       return $this->render_textarea('header');
     }
@@ -2003,7 +2003,7 @@
   /**
    * Render the footer of the view.
    */
-  function render_footer() {
+  public function render_footer() {
     if (!empty($this->view->result) || $this->get_option('footer_empty')) {
       return $this->render_textarea('footer');
     }
@@ -2012,28 +2012,28 @@
   /**
    * Render the empty text of the view.
    */
-  function render_empty() { return $this->render_textarea('empty'); }
+  public function render_empty() { return $this->render_textarea('empty'); }
   /**
    * If this display creates a block, implement one of these.
    */
-  function hook_block_save($delta = 0, $edit = array()) { return array(); }
+  public function hook_block_save($delta = 0, $edit = array()) { return array(); }
 
   /**
    * If this display creates a page with a menu item, implement it here.
    */
-  function hook_menu() { return array(); }
+  public function hook_menu() { return array(); }
 
   /**
    * Render this display.
    */
-  function render() {
+  public function render() {
     return theme($this->theme_functions(), array('view' => $this->view));
   }
 
   /**
    * Determine if the user has access to this display of the view.
    */
-  function access($account = NULL) {
+  public function access($account = NULL) {
     if (!isset($account)) {
       global $user;
       $account = $user;
@@ -2058,7 +2058,7 @@
    * from execute because they are extremely common and unlikely to be
    * overridden on an individual display.
    */
-  function pre_execute() {
+  public function pre_execute() {
     $this->view->set_use_ajax($this->use_ajax());
     if ($this->use_more()) {
       $this->view->get_total_rows = TRUE;
@@ -2076,19 +2076,19 @@
    *
    * The base class cannot be executed.
    */
-  function execute() { }
+  public function execute() { }
 
   /**
    * Fully render the display for the purposes of a live preview or
    * some other AJAXy reason.
    */
-  function preview() { return $this->view->render(); }
+  public function preview() { return $this->view->render(); }
 
   /**
    * Displays can require a certain type of style plugin. By default, they will
    * be 'normal'.
    */
-  function get_style_type() { return 'normal'; }
+  public function get_style_type() { return 'normal'; }
 
   /**
    * Make sure the display and all associated handlers are valid.
@@ -2096,7 +2096,7 @@
    * @return
    *   Empty array if the display is valid; an array of error strings if it is not.
    */
-  function validate() {
+  public function validate() {
     $errors = array();
     // Make sure displays that use fields HAVE fields.
     if ($this->uses_fields()) {
@@ -2144,7 +2144,7 @@
   /**
    * Check if the provided identifier is unique.
    */
-  function is_identifier_unique($id, $identifier) {
+  public function is_identifier_unique($id, $identifier) {
     foreach (views_object_types() as $type => $info) {
       foreach ($this->get_handlers($type) as $key => $handler) {
         if ($handler->can_expose() && $handler->is_exposed()) {
@@ -2160,7 +2160,7 @@
   /**
    * Provide the block system with any exposed widget blocks for this display.
    */
-  function get_special_blocks() {
+  public function get_special_blocks() {
     $delta = '-exp-' . $this->view->name . '-' . $this->display->id;
     $desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->name, '@display_id' => $this->display->id));
 
@@ -2174,7 +2174,7 @@
   /**
    * Render any special blocks provided for this display.
    */
-  function view_special_blocks($type) {
+  public function view_special_blocks($type) {
     if ($type == '-exp') {
       // avoid interfering with the admin forms.
       if (arg(0) == 'admin' && arg(1) == 'build' && arg(2) == 'views') {
@@ -2196,7 +2196,7 @@
    * Because displays do not want to export options that are NOT overridden from the
    * default display, we need some special handling during the export process.
    */
-  function export_option($indent, $prefix, $storage, $option, $definition, $parents) {
+  public function export_option($indent, $prefix, $storage, $option, $definition, $parents) {
     // The $prefix is wrong because we store our actual options a little differently:
     $prefix = '$handler->display->display_options';
     $output = '';
@@ -2225,7 +2225,7 @@
    * the export off to the individual handlers so that they can export themselves
    * properly.
    */
-  function export_handler($indent, $prefix, $storage, $option, $definition, $parents) {
+  public function export_handler($indent, $prefix, $storage, $option, $definition, $parents) {
     $output = '';
 
     // cut the 's' off because the data is stored as the plural form but we need
@@ -2254,7 +2254,7 @@
    * row_options accordingly. The options are told not to export, and the
    * export for the plugin should export both.
    */
-  function export_style($indent, $prefix, $storage, $option, $definition, $parents) {
+  public function export_style($indent, $prefix, $storage, $option, $definition, $parents) {
     $output = '';
     $style_plugin = $this->get_plugin();
     if ($option == 'style_plugin') {
@@ -2293,7 +2293,7 @@
    * array, but for legacy plugins (access and cache) options are stored as
    * siblings to the type.
    */
-  function export_plugin($indent, $prefix, $storage, $option, $definition, $parents) {
+  public function export_plugin($indent, $prefix, $storage, $option, $definition, $parents) {
     $output = '';
     $plugin_type = end($parents);
     $plugin = $this->get_plugin($plugin_type);
Index: plugins/views_plugin_style_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_default.inc,v
retrieving revision 1.2
diff -u -r1.2 views_plugin_style_default.inc
--- plugins/views_plugin_style_default.inc	30 Sep 2008 19:47:11 -0000	1.2
+++ plugins/views_plugin_style_default.inc	6 Feb 2010 18:23:35 -0000
@@ -15,11 +15,11 @@
   /**
    * Set default options
    */
-  function options(&$options) {
+  public function options(&$options) {
     parent::options($options);
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
   }
 }
Index: plugins/views_plugin_style_list.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_list.inc,v
retrieving revision 1.1
diff -u -r1.1 views_plugin_style_list.inc
--- plugins/views_plugin_style_list.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ plugins/views_plugin_style_list.inc	6 Feb 2010 18:23:35 -0000
@@ -14,7 +14,7 @@
   /**
    * Set default options
    */
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['type'] = array('default' => 'ul');
@@ -25,7 +25,7 @@
   /**
    * Render the given style.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['type'] = array(
       '#type' => 'radios',
Index: plugins/views_plugin_style_rss.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_rss.inc,v
retrieving revision 1.2.6.2
diff -u -r1.2.6.2 views_plugin_style_rss.inc
--- plugins/views_plugin_style_rss.inc	9 Nov 2009 23:07:29 -0000	1.2.6.2
+++ plugins/views_plugin_style_rss.inc	6 Feb 2010 18:23:35 -0000
@@ -11,7 +11,7 @@
  * @ingroup views_style_plugins
  */
 class views_plugin_style_rss extends views_plugin_style {
-  function attach_to($display_id, $path, $title) {
+  public function attach_to($display_id, $path, $title) {
     $display = $this->view->display[$display_id]->handler;
     $url_options = array();
     $input = $this->view->get_exposed_input();
@@ -40,7 +40,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['description'] = array('default' => '', 'translatable' => TRUE);
@@ -49,7 +49,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['mission_description'] = array(
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['mission_description']),
@@ -71,11 +71,11 @@
    * @return
    *   An array that can be passed to format_xml_elements().
    */
-  function get_channel_elements() {
+  public function get_channel_elements() {
     return array();
   }
 
-  function render() {
+  public function render() {
     if (empty($this->row_plugin)) {
       debug('views_plugin_style_default: Missing row plugin');
       return;
Index: plugins/views_plugin_style_summary.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_summary.inc,v
retrieving revision 1.1.6.3
diff -u -r1.1.6.3 views_plugin_style_summary.inc
--- plugins/views_plugin_style_summary.inc	28 Jan 2010 22:44:37 -0000	1.1.6.3
+++ plugins/views_plugin_style_summary.inc	6 Feb 2010 18:23:35 -0000
@@ -11,7 +11,7 @@
  * @ingroup views_style_plugins
  */
 class views_plugin_style_summary extends views_plugin_style {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['count'] = array('default' => TRUE, 'bool' => TRUE);
@@ -21,13 +21,13 @@
     return $options;
   }
 
-  function query() {
+  public function query() {
     if (!empty($this->options['override'])) {
       $this->view->set_items_per_page(intval($this->options['items_per_page']));
     }
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['count'] = array(
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['count']),
@@ -47,7 +47,7 @@
     );
   }
 
-  function render() {
+  public function render() {
     $rows = array();
     foreach ($this->view->result as $row) {
       // @todo: Include separator as an option.
Index: plugins/views_plugin_display_feed.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display_feed.inc,v
retrieving revision 1.7.4.1
diff -u -r1.7.4.1 views_plugin_display_feed.inc
--- plugins/views_plugin_display_feed.inc	2 Nov 2009 22:01:27 -0000	1.7.4.1
+++ plugins/views_plugin_display_feed.inc	6 Feb 2010 18:23:34 -0000
@@ -13,15 +13,15 @@
  * @ingroup views_display_plugins
  */
 class views_plugin_display_feed extends views_plugin_display_page {
-  function uses_breadcrumb() { return FALSE; }
-  function get_style_type() { return 'feed'; }
+  public function uses_breadcrumb() { return FALSE; }
+  public function get_style_type() { return 'feed'; }
 
   /**
    * Feeds do not go through the normal page theming mechanism. Instead, they
    * go through their own little theme function and then return NULL so that
    * Drupal believes that the page has already rendered itself...which it has.
    */
-  function execute() {
+  public function execute() {
     $output = $this->view->render();
     if (empty($output)) {
       return drupal_not_found();
@@ -29,7 +29,7 @@
     print $output;
   }
 
-  function preview() {
+  public function preview() {
     if (!empty($this->live_preview)) {
       return '<pre>' . check_plain($this->view->render()) . '</pre>';
     }
@@ -40,11 +40,11 @@
    * Instead of going through the standard views_view.tpl.php, delegate this
    * to the style handler.
    */
-  function render() {
+  public function render() {
     return $this->view->style_plugin->render($this->view->result);
   }
 
-  function defaultable_sections($section = NULL) {
+  public function defaultable_sections($section = NULL) {
     if (in_array($section, array('style_options', 'style_plugin', 'row_options', 'row_plugin',))) {
       return FALSE;
     }
@@ -61,7 +61,7 @@
     return $sections;
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['displays'] = array('default' => array());
@@ -79,7 +79,7 @@
     return $options;
   }
 
-  function options_summary(&$categories, &$options) {
+  public function options_summary(&$categories, &$options) {
     // It is very important to call the parent function here:
     parent::options_summary($categories, $options);
 
@@ -121,7 +121,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     // It is very important to call the parent function here.
     parent::options_form($form, $form_state);
 
@@ -163,7 +163,7 @@
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
@@ -179,7 +179,7 @@
   /**
    * Attach to another view.
    */
-  function attach_to($display_id) {
+  public function attach_to($display_id) {
     $displays = $this->get_option('displays');
     if (empty($displays[$display_id])) {
       return;
@@ -196,7 +196,7 @@
     }
   }
 
-  function uses_link_display() {
+  public function uses_link_display() {
     return TRUE;
   }
 }
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.3
diff -u -r1.4.4.3 views_plugin_row.inc
--- plugins/views_plugin_row.inc	28 Jan 2010 23:18:39 -0000	1.4.4.3
+++ plugins/views_plugin_row.inc	6 Feb 2010 18:23:35 -0000
@@ -26,7 +26,7 @@
   /**
    * Initialize the row plugin.
    */
-  function init(&$view, &$display, $options = NULL) {
+  public function init(&$view, &$display, $options = NULL) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -34,12 +34,12 @@
     $this->unpack_options($this->options, isset($options) ? $options : $display->handler->get_option('row_options'));
   }
 
-  function uses_fields() {
+  public function uses_fields() {
     return !empty($this->definition['uses fields']);
   }
 
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     if (isset($this->base_table)) {
       $options['relationship'] = array('default' => 'none');
@@ -51,7 +51,7 @@
   /**
    * Provide a form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     if (isset($this->base_table)) {
       $view = &$form_state['view'];
 
@@ -99,15 +99,15 @@
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) { }
+  public function options_validate($form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) { }
+  public function options_submit($form, &$form_state) { }
 
-  function query() {
+  public function query() {
     if (isset($this->base_table)) {
       if (isset($this->options['relationship']) && isset($this->view->relationship[$this->options['relationship']])) {
         $relationship = $this->view->relationship[$this->options['relationship']];
@@ -125,13 +125,13 @@
    * @param $result
    *   The full array of results from the query.
    */
-  function pre_render($result) { }
+  public function pre_render($result) { }
 
   /**
    * Render a row object. This usually passes through to a theme template
    * of some form, but not always.
    */
-  function render($row) {
+  public function render($row) {
     return theme($this->theme_functions(),
       array(
         'view' => $this->view,
Index: plugins/views_plugin_pager_none.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_pager_none.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_plugin_pager_none.inc
--- plugins/views_plugin_pager_none.inc	6 Feb 2010 13:29:48 -0000	1.1.4.2
+++ plugins/views_plugin_pager_none.inc	6 Feb 2010 18:23:35 -0000
@@ -7,14 +7,14 @@
  * @ingroup views_pager_plugins
  */
 class views_plugin_pager_none extends views_plugin_pager {
-  function summary_title() {
+  public function summary_title() {
     if (!empty($this->options['offset'])) {
       return t('All items, skip @skip', array('@skip' => $this->options['offset']));
     }
     return t('All items');
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['offset'] = array('default' => 0);
 
@@ -24,7 +24,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['offset'] = array(
       '#type' => 'textfield',
       '#title' => t('Offset'),
@@ -33,27 +33,27 @@
     );
   }
 
-  function use_pager() {
+  public function use_pager() {
     return FALSE;
   }
 
-  function use_count_query() {
+  public function use_count_query() {
     return FALSE;
   }
 
-  function get_items_per_page() {
+  public function get_items_per_page() {
     return 0;
   }
 
-  function execute_count_query(&$count_query) {
+  public function execute_count_query(&$count_query) {
     // If we are displaying all items, never count. But we can update the count in post_execute.
   }
 
-  function post_execute($result) {
+  public function post_execute($result) {
     $this->total_items = count($result);
   }
 
-  function query() {
+  public function query() {
     // The only query modifications we might do are offsets.
     if (!empty($this->options['offset'])) {
       $this->view->query->set_offset($this->options['offset']);
Index: plugins/views_plugin_style_table.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_table.inc,v
retrieving revision 1.7.4.4
diff -u -r1.7.4.4 views_plugin_style_table.inc
--- plugins/views_plugin_style_table.inc	23 Dec 2009 21:30:27 -0000	1.7.4.4
+++ plugins/views_plugin_style_table.inc	6 Feb 2010 18:23:35 -0000
@@ -11,7 +11,7 @@
  * @ingroup views_style_plugins
  */
 class views_plugin_style_table extends views_plugin_style {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['columns'] = array('default' => array());
@@ -27,7 +27,7 @@
   /**
    * Determine if we should provide sorting based upon $_GET inputs.
    */
-  function build_sort() {
+  public function build_sort() {
     if (!isset($_GET['order']) && ($this->options['default'] == -1 || empty($this->view->field[$this->options['default']]))) {
       return TRUE;
     }
@@ -44,7 +44,7 @@
   /**
    * Add our actual sort criteria
    */
-  function build_sort_post() {
+  public function build_sort_post() {
     if (!isset($_GET['order'])) {
       // check for a 'default' clicksort. If there isn't one, exit gracefully.
       if (empty($this->options['default'])) {
@@ -97,7 +97,7 @@
    *   send the fields through, as they may be different than what the
    *   display has listed due to access control or other changes.
    */
-  function sanitize_columns($columns, $fields = NULL) {
+  public function sanitize_columns($columns, $fields = NULL) {
     $sanitized = array();
     if ($fields === NULL) {
       $fields = $this->display->handler->get_option('fields');
@@ -132,7 +132,7 @@
   /**
    * Render the given style.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $handlers = $this->display->handler->get_handlers('field');
     if (empty($handlers)) {
Index: plugins/views_plugin_argument_default_php.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_argument_default_php.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_plugin_argument_default_php.inc
--- plugins/views_plugin_argument_default_php.inc	28 Jan 2010 22:44:37 -0000	1.1.6.2
+++ plugins/views_plugin_argument_default_php.inc	6 Feb 2010 18:23:34 -0000
@@ -9,14 +9,14 @@
  * Default argument plugin to provide a PHP code block.
  */
 class views_plugin_argument_default_php extends views_plugin_argument_default {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['code'] = array('default' => '');
 
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['code'] = array(
       '#type' => 'textarea',
       '#title' => t('PHP argument code'),
@@ -29,7 +29,7 @@
     $this->check_access($form, 'code');
   }
 
-  function convert_options(&$options) {
+  public function convert_options(&$options) {
     if (!isset($options['code']) && isset($this->argument->options['default_argument_php'])) {
       $options['code'] = $this->argument->options['default_argument_php'];
     }
@@ -39,11 +39,11 @@
    * Only let users with PHP block visibility permissions set/modify this
    * default plugin.
    */
-  function access() {
+  public function access() {
     return user_access('use PHP for settings');
   }
 
-  function get_argument() {
+  public function get_argument() {
     // set up variables to make it easier to reference during the argument.
     $view = &$this->view;
     $argument = &$this->argument;
Index: plugins/views_plugin_argument_default_fixed.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_argument_default_fixed.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_plugin_argument_default_fixed.inc
--- plugins/views_plugin_argument_default_fixed.inc	28 Jan 2010 22:45:04 -0000	1.1.4.2
+++ plugins/views_plugin_argument_default_fixed.inc	6 Feb 2010 18:23:34 -0000
@@ -9,14 +9,14 @@
  * The fixed argument default handler.
  */
 class views_plugin_argument_default_fixed extends views_plugin_argument_default {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['argument'] = array('default' => '');
 
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['argument'] = array(
       '#type' => 'textfield',
       '#title' => t('Default argument'),
@@ -27,11 +27,11 @@
   /**
    * Return the default argument.
    */
-  function get_argument() {
+  public function get_argument() {
     return $this->options['argument'];
   }
 
-  function convert_options(&$options) {
+  public function convert_options(&$options) {
     if (!isset($options['argument']) && isset($this->argument->options['default_argument_fixed'])) {
       $options['argument'] = $this->argument->options['default_argument_fixed'];
     }
Index: plugins/views_plugin_query.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_query.inc,v
retrieving revision 1.1.4.4
diff -u -r1.1.4.4 views_plugin_query.inc
--- plugins/views_plugin_query.inc	6 Feb 2010 13:29:48 -0000	1.1.4.4
+++ plugins/views_plugin_query.inc	6 Feb 2010 18:23:35 -0000
@@ -12,12 +12,12 @@
   /**
    * A pager plugin that should be provided by the display.
    */
-  var $pager = NULL;
+  public $pager = NULL;
 
   /**
    * Constructor; Create the basic query object and fill with default values.
    */
-  function init($base_table, $base_field) {  }
+  public function init($base_table, $base_field) {  }
 
   /**
    * Generate a query and a countquery from all of the information supplied
@@ -26,17 +26,17 @@
    * @param $get_count
    *   Provide a countquery if this is true, otherwise provide a normal query.
    */
-  function query($get_count = FALSE) { }
+  public function query($get_count = FALSE) { }
 
   /**
    * Let modules modify the query just prior to finalizing it.
    */
-  function alter(&$view) {  }
+  public function alter(&$view) {  }
 
   /**
    * Builds the necessary info to execute the query.
    */
-  function build(&$view) { }
+  public function build(&$view) { }
 
   /**
    * Executes the query and fills the associated view object with according
@@ -45,7 +45,7 @@
    * Values to set: $view->result, $view->total_rows, $view->execute_time,
    * $view->pager['current_page'].
    */
-  function execute(&$view) {  }
+  public function execute(&$view) {  }
 
   /**
    * Add a signature to the query, if such a thing is feasible.
@@ -53,30 +53,30 @@
    * This signature is something that can be used when perusing query logs to
    * discern where particular queries might be coming from.
    */
-  function add_signature(&$view) { }
+  public function add_signature(&$view) { }
 
   /**
    * Get aggregation info for group by queries.
    *
    * If NULL, aggregation is not allowed.
    */
-  function get_aggregation_info() { }
+  public function get_aggregation_info() { }
 
   /**
    * Set a LIMIT on the query, specifying a maximum number of results.
    */
-  function set_limit($limit) {
+  public function set_limit($limit) {
     $this->limit = $limit;
   }
 
   /**
    * Set an OFFSET on the query, specifying a number of results to skip
    */
-  function set_offset($offset) {
+  public function set_offset($offset) {
     $this->offset = $offset;
   }
 
-  function init_pager(&$view) {
+  public function init_pager(&$view) {
     // @todo -- probably this should be a method on the display rather than directly calling
     // get plugin?
     $this->pager = $view->display_handler->get_plugin('pager');
@@ -85,7 +85,7 @@
   /**
    * Render the pager, if necessary.
    */
-  function render_pager() {
+  public function render_pager() {
     if (!empty($this->pager) && $this->pager->use_pager()) {
       $exposed_input = isset($this->view->exposed_data_raw) ? $this->view->exposed_data_raw : NULL;
       return $this->pager->render($exposed_input);
Index: plugins/views_plugin_argument_validate_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_argument_validate_numeric.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_plugin_argument_validate_numeric.inc
--- plugins/views_plugin_argument_validate_numeric.inc	28 Jan 2010 22:44:37 -0000	1.1.6.1
+++ plugins/views_plugin_argument_validate_numeric.inc	6 Feb 2010 18:23:34 -0000
@@ -11,7 +11,7 @@
  * @ingroup views_argument_validate_plugins
  */
 class views_plugin_argument_validate_numeric extends views_plugin_argument_validate {
-  function validate_argument($argument) {
+  public function validate_argument($argument) {
     return is_numeric($argument);
   }
 }
Index: plugins/views_plugin_argument_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_argument_default.inc,v
retrieving revision 1.2.4.2
diff -u -r1.2.4.2 views_plugin_argument_default.inc
--- plugins/views_plugin_argument_default.inc	28 Jan 2010 22:44:37 -0000	1.2.4.2
+++ plugins/views_plugin_argument_default.inc	6 Feb 2010 18:23:34 -0000
@@ -24,13 +24,13 @@
    *
    * This needs to be overridden by every default argument handler to properly do what is needed.
    */
-  function get_argument() { }
+  public function get_argument() { }
 
   /**
    * Initialize this plugin with the view and the argument
    * it is linked to.
    */
-  function init(&$view, &$argument, $options) {
+  public function init(&$view, &$argument, $options) {
     $this->view = &$view;
     $this->argument = &$argument;
 
@@ -42,28 +42,28 @@
    * Retrieve the options when this is a new access
    * control plugin
    */
-  function option_definition() { return array(); }
+  public function option_definition() { return array(); }
 
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) { }
+  public function options_form(&$form, &$form_state) { }
 
   /**
    * Provide the default form form for validating options
    */
-  function options_validate(&$form, &$form_state) { }
+  public function options_validate(&$form, &$form_state) { }
 
   /**
    * Provide the default form form for submitting options
    */
-  function options_submit(&$form, &$form_state) { }
+  public function options_submit(&$form, &$form_state) { }
 
   /**
    * Determine if the administrator has the privileges to use this
    * plugin
    */
-  function access() { return TRUE; }
+  public function access() { return TRUE; }
 
   /**
    * If we don't have access to the form but are showing it anyway, ensure that
@@ -72,7 +72,7 @@
    * This is only called by child objects if specified in the options_form(),
    * so it will not always be used.
    */
-  function check_access(&$form, $option_name) {
+  public function check_access(&$form, $option_name) {
     if (!$this->access()) {
       $form[$option_name]['#disabled'] = TRUE;
       $form[$option_name]['#value'] = $form[$this->option_name]['#default_value'];
@@ -88,7 +88,7 @@
    * move arguments from the old style to the new style. See
    * views_plugin_argument_default_fixed for a good example of this method.
    */
-  function convert_options(&$options) { }
+  public function convert_options(&$options) { }
 }
 
 /**
Index: plugins/views_plugin_access.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_access.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_plugin_access.inc
--- plugins/views_plugin_access.inc	13 Nov 2009 23:19:22 -0000	1.1.6.1
+++ plugins/views_plugin_access.inc	6 Feb 2010 18:23:34 -0000
@@ -15,7 +15,7 @@
    * @param $display
    *   The display handler.
    */
-  function init(&$view, &$display) {
+  public function init(&$view, &$display) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -30,35 +30,35 @@
    * Retrieve the options when this is a new access
    * control plugin
    */
-  function option_definition() { return array(); }
+  public function option_definition() { return array(); }
 
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) { }
+  public function options_form(&$form, &$form_state) { }
 
   /**
    * Provide the default form form for validating options
    */
-  function options_validate(&$form, &$form_state) { }
+  public function options_validate(&$form, &$form_state) { }
 
   /**
    * Provide the default form form for submitting options
    */
-  function options_submit(&$form, &$form_state) { }
+  public function options_submit(&$form, &$form_state) { }
 
   /**
    * Return a string to display as the clickable title for the
    * access control.
    */
-  function summary_title() {
+  public function summary_title() {
     return t('Unknown');
   }
 
   /**
    * Determine if the current user has access or not.
    */
-  function access($account) {
+  public function access($account) {
     // default to no access control.
     return TRUE;
   }
@@ -75,7 +75,7 @@
    *   item may also be TRUE (bool only) which will indicate no
    *   access control.)
    */
-  function get_access_callback() {
+  public function get_access_callback() {
     // default to no access control.
     return TRUE;
   }
Index: plugins/views_plugin_style_summary_unformatted.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_summary_unformatted.inc,v
retrieving revision 1.1
diff -u -r1.1 views_plugin_style_summary_unformatted.inc
--- plugins/views_plugin_style_summary_unformatted.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ plugins/views_plugin_style_summary_unformatted.inc	6 Feb 2010 18:23:35 -0000
@@ -11,14 +11,14 @@
  * @ingroup views_style_plugins
  */
 class views_plugin_style_summary_unformatted extends views_plugin_style_summary {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['inline'] = array('default' => FALSE);
     $options['separator'] = array('default' => '');
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['inline'] = array(
       '#type' => 'checkbox',
Index: plugins/views_plugin_pager_some.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_pager_some.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_plugin_pager_some.inc
--- plugins/views_plugin_pager_some.inc	6 Feb 2010 13:29:48 -0000	1.1.4.2
+++ plugins/views_plugin_pager_some.inc	6 Feb 2010 18:23:35 -0000
@@ -7,14 +7,14 @@
  * @ingroup views_pager_plugins
  */
 class views_plugin_pager_some extends views_plugin_pager {
-  function summary_title() {
+  public function summary_title() {
     if (!empty($this->options['offset'])) {
       return format_plural($this->options['items_per_page'], '@count item, skip @skip', '@count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']));
     }
       return format_plural($this->options['items_per_page'], '@count item', '@count items', array('@count' => $this->options['items_per_page']));
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['items_per_page'] = array('default' => 10);
     $options['offset'] = array('default' => 0);
@@ -25,7 +25,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['items_per_page'] = array(
       '#title' => t('Items to display'),
       '#type' => 'textfield',
@@ -41,15 +41,15 @@
     );
   }
 
-  function use_pager() {
+  public function use_pager() {
     return FALSE;
   }
 
-  function use_count_query() {
+  public function use_count_query() {
     return FALSE;
   }
 
-  function query() {
+  public function query() {
     $this->view->query->set_limit($this->options['items_per_page']);
     $this->view->query->set_offset($this->options['offset']);
   }
Index: plugins/views_plugin_display_page.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display_page.inc,v
retrieving revision 1.8.4.4
diff -u -r1.8.4.4 views_plugin_display_page.inc
--- plugins/views_plugin_display_page.inc	29 Jan 2010 00:11:08 -0000	1.8.4.4
+++ plugins/views_plugin_display_page.inc	6 Feb 2010 18:23:35 -0000
@@ -14,10 +14,10 @@
   /**
    * The page display has a path.
    */
-  function has_path() { return TRUE; }
-  function uses_breadcrumb() { return TRUE; }
+  public function has_path() { return TRUE; }
+  public function uses_breadcrumb() { return TRUE; }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['path'] = array('default' => '');
@@ -47,7 +47,7 @@
   /**
    * Add this display's path information to Drupal's menu system.
    */
-  function execute_hook_menu() {
+  public function execute_hook_menu() {
     $items = array();
     // Replace % with the link to our standard views argument loader
     // views_arg_load -- which lives in views.module
@@ -163,7 +163,7 @@
    * a drupal_set_title for the page, and does a views_set_page_view
    * on the view.
    */
-  function execute() {
+  public function execute() {
     // Let the world know that this is the page view we're using.
     views_set_page_view($this);
 
@@ -188,7 +188,7 @@
    *
    * This output is returned as an array.
    */
-  function options_summary(&$categories, &$options) {
+  public function options_summary(&$categories, &$options) {
     // It is very important to call the parent function here:
     parent::options_summary($categories, $options);
 
@@ -248,7 +248,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_form($form, $form_state);
 
@@ -394,7 +394,7 @@
     }
   }
 
-  function options_validate(&$form, &$form_state) {
+  public function options_validate(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_validate($form, $form_state);
     switch ($form_state['section']) {
@@ -432,7 +432,7 @@
     }
   }
 
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
@@ -452,7 +452,7 @@
     }
   }
 
-  function validate() {
+  public function validate() {
     $errors = parent::validate();
 
     $menu = $this->get_option('menu');
Index: plugins/views_plugin_exposed_form_input_required.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_exposed_form_input_required.inc,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 views_plugin_exposed_form_input_required.inc
--- plugins/views_plugin_exposed_form_input_required.inc	25 Jan 2010 16:18:12 -0000	1.2.2.3
+++ plugins/views_plugin_exposed_form_input_required.inc	6 Feb 2010 18:23:35 -0000
@@ -6,11 +6,11 @@
  */
 class views_plugin_exposed_form_input_required extends views_plugin_exposed_form {
 
-  function summary_title() {
+  public function summary_title() {
     return t('Input required');
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['text_input_required'] = array('default' => t('Select any filter and click on Apply to see results'), 'translatable' => TRUE);
@@ -18,7 +18,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['text_input_required'] = array(
@@ -31,13 +31,13 @@
     $form['text_input_required_format'] = filter_form($this->options['text_input_required_format'], NULL, array('text_input_required_format'));
   }
 
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     $form_state['values']['exposed_form_options']['text_input_required_format'] = $form_state['values']['text_input_required_format'];
 
     parent::options_submit($form, $form_state);
   }
 
-  function exposed_filter_applied() {
+  public function exposed_filter_applied() {
     static $cache = NULL;
     if (!isset($cache)) {
       $view = $this->view;
@@ -59,14 +59,14 @@
     return $cache;
   }
 
-  function pre_render() {
+  public function pre_render() {
     if (!$this->exposed_filter_applied()) {
       $this->view->display_handler->set_option('empty', $this->options['text_input_required']);
       $this->view->display_handler->set_option('empty_format', $this->options['text_input_required_format']);
     }
   }
 
-  function query() {
+  public function query() {
     if (!$this->exposed_filter_applied()) {
       // We return with no query; this will force the empty text.
       $this->view->built = TRUE;
Index: plugins/views_plugin_pager.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_pager.inc,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 views_plugin_pager.inc
--- plugins/views_plugin_pager.inc	6 Feb 2010 14:17:10 -0000	1.1.4.3
+++ plugins/views_plugin_pager.inc	6 Feb 2010 18:23:35 -0000
@@ -7,8 +7,8 @@
  * @ingroup views_pager_plugins
  */
 class views_plugin_pager extends views_plugin {
-  var $current_page = NULL;
-  var $total_items = 0;
+  public $current_page = NULL;
+  public $total_items = 0;
 
   /**
    * Initialize the plugin.
@@ -18,7 +18,7 @@
    * @param $display
    *   The display handler.
    */
-  function init(&$view, &$display, $options = array()) {
+  public function init(&$view, &$display, $options = array()) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -31,7 +31,7 @@
    * All but the leanest pagers should probably return a value here, so
    * most pagers will not need to override this method.
    */
-  function get_items_per_page() {
+  public function get_items_per_page() {
     return isset($this->options['items_per_page']) ? $this->options['items_per_page'] : 0;
   }
 
@@ -41,7 +41,7 @@
    * Even pagers that don't actually page can skip items at the beginning,
    * so few pagers will need to override this method.
    */
-  function get_offset() {
+  public function get_offset() {
     return isset($this->options['offset']) ? $this->options['offset'] : 0;
   }
 
@@ -50,7 +50,7 @@
    *
    * If NULL, we do not know what the current page is.
    */
-  function get_current_page() {
+  public function get_current_page() {
     return $this->current_page;
   }
 
@@ -61,7 +61,7 @@
    *   If provided, the page number will be set to this. If NOT provided,
    *   the page number will be set from the global page array.
    */
-  function set_current_page($number = NULL) {
+  public function set_current_page($number = NULL) {
     $this->current_page = $number;
   }
 
@@ -70,25 +70,25 @@
    *
    * If NULL, we do not yet know what the total number of items are.
    */
-  function get_total_items() {
+  public function get_total_items() {
     return $this->total_items;
   }
 
   /**
    * Provide the default form form for validating options
    */
-  function options_validate(&$form, &$form_state) { }
+  public function options_validate(&$form, &$form_state) { }
 
   /**
    * Provide the default form form for submitting options
    */
-  function options_submit(&$form, &$form_state) { }
+  public function options_submit(&$form, &$form_state) { }
 
   /**
    * Return a string to display as the clickable title for the
    * pager plugin.
    */
-  function summary_title() {
+  public function summary_title() {
     return t('Unknown');
   }
 
@@ -97,7 +97,7 @@
    *
    * Only a couple of very specific pagers will set this to false.
    */
-  function use_pager() {
+  public function use_pager() {
     return TRUE;
   }
 
@@ -106,7 +106,7 @@
    *
    * If a pager needs a count query, a simple query
    */
-  function use_count_query() {
+  public function use_count_query() {
     return TRUE;
   }
 
@@ -114,7 +114,7 @@
    * Execute the count query, which will be done just prior to the query
    * itself being executed.
    */
-  function execute_count_query(&$count_query) {
+  public function execute_count_query(&$count_query) {
     $this->total_items = $count_query->execute()->fetchField();
     if (!empty($this->options['offset'])) {
       $this->total_items -= $this->options['offset'];
@@ -128,7 +128,7 @@
    * If there are pagers that need global values set, this method can
    * be used to set them. It will be called when the count query is run.
    */
-  function update_page_info() {
+  public function update_page_info() {
 
   }
 
@@ -137,17 +137,17 @@
    *
    * This is called during the build phase and can directly modify the query.
    */
-  function query() { }
+  public function query() { }
 
   /**
    * Perform any needed actions just prior to the query executing.
    */
-  function pre_execute(&$query) { }
+  public function pre_execute(&$query) { }
 
   /**
    * Perform any needed actions just after the query executing.
    */
-  function post_execute(&$result) { }
+  public function post_execute(&$result) { }
 
   /**
    * Render the pager.
@@ -159,14 +159,14 @@
    *   Any extra GET parameters that should be retained, such as exposed
    *   input.
    */
-  function render($input) { }
+  public function render($input) { }
 
   /**
    * Determine if there are more records available.
    *
    * This is primarily used to control the display of a more link.
    */
-  function has_more_records() {
+  public function has_more_records() {
     return $this->get_items_per_page()
       && $this->total_items > (intval($this->current_page) + 1) * $this->get_items_per_page();
   }
Index: plugins/views_plugin_row_fields.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_row_fields.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_plugin_row_fields.inc
--- plugins/views_plugin_row_fields.inc	2 Nov 2009 22:01:27 -0000	1.2.4.1
+++ plugins/views_plugin_row_fields.inc	6 Feb 2010 18:23:35 -0000
@@ -14,7 +14,7 @@
  * @ingroup views_row_plugins
  */
 class views_plugin_row_fields extends views_plugin_row {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['inline'] = array('default' => array());
@@ -26,7 +26,7 @@
   /**
    * Provide a form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $options = array();
     foreach ($this->display->handler->get_handlers('field') as $field => $handler) {
       $options[$field] = $handler->ui_name();
@@ -65,7 +65,7 @@
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) {
+  public function options_submit($form, &$form_state) {
     $form_state['values']['row_options']['inline'] = array_filter($form_state['values']['row_options']['inline']);
   }
 }
Index: plugins/views_plugin_argument_validate_php.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_argument_validate_php.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_plugin_argument_validate_php.inc
--- plugins/views_plugin_argument_validate_php.inc	28 Jan 2010 22:44:37 -0000	1.1.6.2
+++ plugins/views_plugin_argument_validate_php.inc	6 Feb 2010 18:23:34 -0000
@@ -11,14 +11,14 @@
  * @ingroup views_argument_validate_plugins
  */
 class views_plugin_argument_validate_php extends views_plugin_argument_validate {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['code'] = array('default' => '');
 
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['code'] = array(
       '#type' => 'textarea',
       '#title' => t('PHP validate code'),
@@ -33,17 +33,17 @@
    * Only let users with PHP block visibility permissions set/modify this
    * validate plugin.
    */
-  function access() {
+  public function access() {
     return user_access('use PHP for settings');
   }
 
-  function convert_options(&$options) {
+  public function convert_options(&$options) {
     if (!isset($options['code']) && isset($this->argument->options['validate_argument_php'])) {
       $options['code'] = $this->argument->options['validate_argument_php'];
     }
   }
 
-  function validate_argument($argument) {
+  public function validate_argument($argument) {
     // set up variables to make it easier to reference during the argument.
     $view = &$this->view;
     $handler = &$this->argument;
Index: plugins/views_plugin_cache_time.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_cache_time.inc,v
retrieving revision 1.3.4.2
diff -u -r1.3.4.2 views_plugin_cache_time.inc
--- plugins/views_plugin_cache_time.inc	13 Nov 2009 23:19:22 -0000	1.3.4.2
+++ plugins/views_plugin_cache_time.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Simple caching of query results for Views displays.
  */
 class views_plugin_cache_time extends views_plugin_cache {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['results_lifespan'] = array('default' => 3600);
     $options['output_lifespan'] = array('default' => 3600);
@@ -13,7 +13,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $options = array(60, 300, 1800, 3600, 21600, 518400);
     $options = drupal_map_assoc($options, 'format_interval');
     $options = array(-1 => t('Never cache')) + $options;
@@ -34,11 +34,11 @@
     );
   }
 
-  function summary_title() {
+  public function summary_title() {
     return format_interval($this->options['results_lifespan'], 1) . '/' . format_interval($this->options['output_lifespan'], 1);
   }
 
-  function cache_expire($type) {
+  public function cache_expire($type) {
     if ($lifespan = $this->options[$type . '_lifespan']) {
       $cutoff = REQUEST_TIME - $lifespan;
       return $cutoff;
Index: plugins/views_plugin_cache.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_cache.inc,v
retrieving revision 1.5.4.4
diff -u -r1.5.4.4 views_plugin_cache.inc
--- plugins/views_plugin_cache.inc	6 Feb 2010 13:29:48 -0000	1.5.4.4
+++ plugins/views_plugin_cache.inc	6 Feb 2010 18:23:34 -0000
@@ -10,12 +10,12 @@
   /**
    * Contains all data that should be written/read from cache.
    */
-  var $storage = array();
+  public $storage = array();
 
   /**
    * What table to store data in.
    */
-  var $table = 'cache_views_data';
+  public $table = 'cache_views_data';
 
   /**
    * Initialize the plugin.
@@ -25,7 +25,7 @@
    * @param $display
    *   The display handler.
    */
-  function init(&$view, &$display) {
+  public function init(&$view, &$display) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -40,7 +40,7 @@
    * Return a string to display as the clickable title for the
    * access control.
    */
-  function summary_title() {
+  public function summary_title() {
     return t('Unknown');
   }
 
@@ -52,14 +52,14 @@
    * @param $type
    *   The cache type, either 'query', 'result' or 'output'.
    */
-   function cache_expire($type) { }
+   public function cache_expire($type) { }
 
   /**
    * Save data to the cache.
    *
    * A plugin should override this to provide specialized caching behavior.
    */
-  function cache_set($type) {
+  public function cache_set($type) {
     switch ($type) {
       case 'query':
         // Not supported currently, but this is certainly where we'd put it.
@@ -86,7 +86,7 @@
    *
    * A plugin should override this to provide specialized caching behavior.
    */
-  function cache_get($type) {
+  public function cache_get($type) {
     $cutoff = $this->cache_expire($type);
     switch ($type) {
       case 'query':
@@ -124,7 +124,7 @@
    * We're just going to nuke anything related to the view, regardless of display,
    * to be sure that we catch everything. Maybe that's a bad idea.
    */
-  function cache_flush() {
+  public function cache_flush() {
     cache_clear_all($this->view->name . ':', $this->table, TRUE);
   }
 
@@ -148,7 +148,7 @@
    * All of the cached result data will be available in $view->result, as well,
    * so all ids used in the query should be discoverable.
    */
-  function post_render(&$output) { }
+  public function post_render(&$output) { }
 
   /**
    * Start caching javascript, css and other out of band info.
@@ -157,9 +157,9 @@
    * duplicate it. Later on, when gather_headers() is run, this information
    * will be removed so that we don't hold onto it.
    */
-  function cache_start() {
+  public function cache_start() {
     $this->storage['head'] = drupal_add_html_head();
-    $this->storage['css'] = drupal_add_css();  
+    $this->storage['css'] = drupal_add_css();
     $js = drupal_add_js();
     foreach ($js as $key => $data) {
       if ($data['scope'] == 'header' || $data['scope'] == 'footer') {
@@ -171,7 +171,7 @@
   /**
    * Gather out of band data, compare it to what we started with and store the difference.
    */
-  function gather_headers() {
+  public function gather_headers() {
     // Simple replacement for head
     if (isset($this->storage['head'])) {
       $this->storage['head'] = str_replace($this->storage['head'], '', drupal_add_html_head());
@@ -212,7 +212,7 @@
   /**
    * Restore out of band data saved to cache. Copied from Panels.
    */
-  function restore_headers() {
+  public function restore_headers() {
     if (!empty($this->storage['head'])) {
       drupal_add_html_head($this->storage['head']);
     }
@@ -228,13 +228,13 @@
     }
   }
 
-  function get_results_key() {
+  public function get_results_key() {
     global $user;
 
     if (!isset($this->_results_key)) {
-      
+
       $build_info = $this->view->build_info;
-      
+
       foreach (array('query', 'count_query') as $index) {
         $query = clone $build_info[$index];
         $query->preExecute();
@@ -258,7 +258,7 @@
     return $this->_results_key;
   }
 
-  function get_output_key() {
+  public function get_output_key() {
     global $user;
     if (!isset($this->_output_key)) {
       $key_data = array(
Index: plugins/views_plugin_access_none.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_access_none.inc,v
retrieving revision 1.1
diff -u -r1.1 views_plugin_access_none.inc
--- plugins/views_plugin_access_none.inc	8 Sep 2008 22:50:17 -0000	1.1
+++ plugins/views_plugin_access_none.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Access plugin that provides no access control at all.
  */
 class views_plugin_access_none extends views_plugin_access {
-  function summary_title() {
+  public function summary_title() {
     return t('Unrestricted');
   }
 }
Index: plugins/views_plugin_exposed_form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_exposed_form.inc,v
retrieving revision 1.2.2.6
diff -u -r1.2.2.6 views_plugin_exposed_form.inc
--- plugins/views_plugin_exposed_form.inc	6 Feb 2010 16:38:11 -0000	1.2.2.6
+++ plugins/views_plugin_exposed_form.inc	6 Feb 2010 18:23:35 -0000
@@ -14,7 +14,7 @@
    * @param $display
    *   The display handler.
    */
-  function init(&$view, &$display, $options = array()) {
+  public function init(&$view, &$display, $options = array()) {
     $this->view = &$view;
     $this->display = &$display;
 
@@ -25,11 +25,11 @@
    * Return a string to display as the clickable title for the
    * control.
    */
-  function summary_title() {
+  public function summary_title() {
     return t('Unknown');
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['submit_button'] = array('default' => t('Apply'), 'translatable' => TRUE);
     $options['reset_button'] = array('default' => FALSE, 'bool' => TRUE);
@@ -39,7 +39,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['submit_button'] = array(
       '#type' => 'textfield',
       '#title' => t('Submit button text'),
@@ -87,7 +87,7 @@
    * also assign data to the appropriate handlers for use in building the
    * query.
    */
-  function render_exposed_form($block = FALSE) {
+  public function render_exposed_form($block = FALSE) {
     // Deal with any exposed filters we may have, before building.
     $form_state = array(
       'view' => &$this->view,
@@ -117,7 +117,7 @@
     return $output;
   }
 
-  function query() {
+  public function query() {
     $view = $this->view;
     $exposed_data = $view->exposed_data;
     $sort_by = $exposed_data['sort_by'];
@@ -138,15 +138,15 @@
     }
   }
 
-  function pre_render() { }
+  public function pre_render() { }
 
-  function post_render(&$output) { }
+  public function post_render(&$output) { }
 
-  function pre_execute() { }
+  public function pre_execute() { }
 
-  function post_execute() { }
+  public function post_execute() { }
 
-  function exposed_form_alter(&$form, &$form_state) {
+  public function exposed_form_alter(&$form, &$form_state) {
     if (!empty($this->options['reset_button'])) {
       $form['reset'] = array(
         '#value' => t('Reset'),
@@ -185,7 +185,7 @@
     }
   }
 
-  function exposed_form_validate(&$form, &$form_state) { }
+  public function exposed_form_validate(&$form, &$form_state) { }
 
   /**
   * This function is executed when exposed form is submited.
@@ -198,13 +198,13 @@
   *   Nested array of keys to exclude of insert into
   *   $view->exposed_raw_input
   */
-  function exposed_form_submit(&$form, &$form_state, &$exclude) {
+  public function exposed_form_submit(&$form, &$form_state, &$exclude) {
     if (isset($form_state['values']['op']) && $form_state['values']['op'] == t('Reset')) {
       $this->reset_form($form, $form_state);
     }
   }
 
-  function reset_form(&$form, &$form_state) {
+  public function reset_form(&$form, &$form_state) {
     unset($_SESSION['views'][$this->view->name][$this->view->current_display]);
     $form_state = array();
     $form_state['values'] = array();
Index: plugins/views_plugin_display_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display_default.inc,v
retrieving revision 1.1
diff -u -r1.1 views_plugin_display_default.inc
--- plugins/views_plugin_display_default.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ plugins/views_plugin_display_default.inc	6 Feb 2010 18:23:34 -0000
@@ -15,7 +15,7 @@
    * Determine if this display is the 'default' display which contains
    * fallback settings
    */
-  function is_default_display() { return TRUE; }
+  public function is_default_display() { return TRUE; }
 
   /**
    * The default execute handler fully renders the view.
@@ -50,7 +50,7 @@
    * as setting page titles, breadcrumbs, and generating exposed filter
    * data if necessary.
    */
-  function execute() {
+  public function execute() {
     return $this->view->render($this->display->id);
   }
 }
\ No newline at end of file
Index: plugins/views_plugin_pager_mini.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_pager_mini.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_plugin_pager_mini.inc
--- plugins/views_plugin_pager_mini.inc	6 Feb 2010 13:29:48 -0000	1.1.4.2
+++ plugins/views_plugin_pager_mini.inc	6 Feb 2010 18:23:35 -0000
@@ -7,14 +7,14 @@
  * @ingroup views_pager_plugins
  */
 class views_plugin_pager_mini extends views_plugin_pager_full {
-  function summary_title() {
+  public function summary_title() {
     if (!empty($this->options['offset'])) {
       return format_plural($this->options['items_per_page'], 'Mini pager, @count item, skip @skip', 'Mini pager, @count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']));
     }
       return format_plural($this->options['items_per_page'], 'Mini pager, @count item', 'Mini pager, @count items', array('@count' => $this->options['items_per_page']));
   }
 
-  function render($input) {
+  public function render($input) {
     $pager_theme = views_theme_functions('views_mini_pager', $this->view, $this->display);
     return theme($pager_theme, array(
       'tags' => $input, 'quantity' => $this->options['items_per_page'], 'element' => $this->options['id']));
Index: plugins/views_plugin_access_perm.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_access_perm.inc,v
retrieving revision 1.3.6.2
diff -u -r1.3.6.2 views_plugin_access_perm.inc
--- plugins/views_plugin_access_perm.inc	13 Nov 2009 23:19:22 -0000	1.3.6.2
+++ plugins/views_plugin_access_perm.inc	6 Feb 2010 18:23:34 -0000
@@ -5,27 +5,27 @@
  * Access plugin that provides permission-based access control.
  */
 class views_plugin_access_perm extends views_plugin_access {
-  function access($account) {
+  public function access($account) {
     return user_access($this->options['perm'], $account);
   }
 
-  function get_access_callback() {
+  public function get_access_callback() {
     return array('user_access', array($this->options['perm']));
   }
 
-  function summary_title() {
+  public function summary_title() {
     return t($this->options['perm']);
   }
 
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['perm'] = array('default' => 'access content');
 
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $perms = array();
     // Get list of permissions
     foreach (module_implements('permission') as $module) {
Index: plugins/views_plugin_style_grid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_style_grid.inc,v
retrieving revision 1.1
diff -u -r1.1 views_plugin_style_grid.inc
--- plugins/views_plugin_style_grid.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ plugins/views_plugin_style_grid.inc	6 Feb 2010 18:23:35 -0000
@@ -14,7 +14,7 @@
   /**
    * Set default options
    */
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['columns'] = array('default' => '4');
@@ -26,7 +26,7 @@
   /**
    * Render the given style.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['columns'] = array(
       '#type' => 'textfield',
Index: plugins/views_plugin_exposed_form_basic.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_exposed_form_basic.inc,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 views_plugin_exposed_form_basic.inc
--- plugins/views_plugin_exposed_form_basic.inc	26 Dec 2009 20:36:39 -0000	1.2.2.2
+++ plugins/views_plugin_exposed_form_basic.inc	6 Feb 2010 18:23:35 -0000
@@ -6,7 +6,7 @@
  */
 class views_plugin_exposed_form_basic extends views_plugin_exposed_form {
 
-  function summary_title() {
+  public function summary_title() {
     return t('Basic');
   }
 
Index: plugins/views_plugin_display_block.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/views_plugin_display_block.inc,v
retrieving revision 1.5.4.1
diff -u -r1.5.4.1 views_plugin_display_block.inc
--- plugins/views_plugin_display_block.inc	2 Nov 2009 22:01:27 -0000	1.5.4.1
+++ plugins/views_plugin_display_block.inc	6 Feb 2010 18:23:34 -0000
@@ -11,7 +11,7 @@
  * @ingroup views_display_plugins
  */
 class views_plugin_display_block extends views_plugin_display {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['block_description'] = array('default' => '', 'translatable' => TRUE);
@@ -25,7 +25,7 @@
    * but extended block handlers might be able to do interesting
    * stuff with it.
    */
-  function execute_hook_block_list($delta = 0, $edit = array()) {
+  public function execute_hook_block_list($delta = 0, $edit = array()) {
     $delta = $this->view->name . '-' . $this->display->id;
     $desc = $this->get_option('block_description');
 
@@ -43,7 +43,7 @@
   /**
    * The display block handler returns the structure necessary for a block.
    */
-  function execute() {
+  public function execute() {
     // Prior to this being called, the $view should already be set to this
     // display, and arguments should be set on the view.
     $info['content'] = $this->view->render();
@@ -58,7 +58,7 @@
    *
    * This output is returned as an array.
    */
-  function options_summary(&$categories, &$options) {
+  public function options_summary(&$categories, &$options) {
     // It is very important to call the parent function here:
     parent::options_summary($categories, $options);
 
@@ -97,7 +97,7 @@
   /**
    * Provide a list of core's block caching modes.
    */
-  function block_caching_modes() {
+  public function block_caching_modes() {
     return array(
       DRUPAL_NO_CACHE => t('Do not cache'),
       DRUPAL_CACHE_GLOBAL => t('Cache once for everything (global)'),
@@ -113,7 +113,7 @@
    * Provide a single method to figure caching type, keeping a sensible default
    * for when it's unset.
    */
-  function get_cache_type() {
+  public function get_cache_type() {
     $cache_type = $this->get_option('block_caching');
     if (empty($cache_type)) {
       $cache_type = DRUPAL_NO_CACHE;
@@ -124,7 +124,7 @@
   /**
    * Provide the default form for setting options.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_form($form, $form_state);
 
@@ -154,7 +154,7 @@
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
@@ -171,7 +171,7 @@
   /**
    * Block views use exposed widgets only if AJAX is set.
    */
-  function uses_exposed() {
+  public function uses_exposed() {
     if ($this->use_ajax()) {
       return parent::uses_exposed();
     }
@@ -183,7 +183,7 @@
    * Save the block cache setting in the blocks table if this block allready
    * exists in the blocks table. Dirty fix untill http://drupal.org/node/235673 gets in.
    */
-  function save_block_cache($delta, $cache_setting) {
+  public function save_block_cache($delta, $cache_setting) {
     if ($bid = db_fetch_object(db_query("SELECT bid, cache FROM {blocks} WHERE module = 'views' AND delta = '%s'", $delta))) {
       db_query("UPDATE {blocks} set cache = %d WHERE module = 'views' AND delta = '%s'", $cache_setting, $delta);
     }
Index: modules/comment/views_handler_field_node_comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_node_comment.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_node_comment.inc
--- modules/comment/views_handler_field_node_comment.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_field_node_comment.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Display node comment status
  */
 class views_handler_field_node_comment extends views_handler_field {
-  function render($values) {
+  public function render($values) {
     switch ($values->{$this->field_alias}) {
       case COMMENT_NODE_DISABLED:
       default:
Index: modules/comment/views_handler_filter_comment_user_uid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_filter_comment_user_uid.inc,v
retrieving revision 1.2.4.2
diff -u -r1.2.4.2 views_handler_filter_comment_user_uid.inc
--- modules/comment/views_handler_filter_comment_user_uid.inc	13 Nov 2009 12:36:06 -0000	1.2.4.2
+++ modules/comment/views_handler_filter_comment_user_uid.inc	6 Feb 2010 18:23:33 -0000
@@ -6,7 +6,7 @@
  * commented on.
  */
 class views_handler_filter_comment_user_uid extends views_handler_filter_user_name {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     $subselect = db_select('comments', 'c');
Index: modules/comment/views_handler_filter_node_comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_filter_node_comment.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_node_comment.inc
--- modules/comment/views_handler_filter_node_comment.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_filter_node_comment.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Filter based on comment node status
  */
 class views_handler_filter_node_comment extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     $this->value_options = array(
       COMMENT_NODE_DISABLED => t('Disabled'),
       COMMENT_NODE_READ_ONLY => t('Read only'),
Index: modules/comment/views_handler_field_comment_username.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment_username.inc,v
retrieving revision 1.2.6.1
diff -u -r1.2.6.1 views_handler_field_comment_username.inc
--- modules/comment/views_handler_field_comment_username.inc	2 Nov 2009 22:01:26 -0000	1.2.6.1
+++ modules/comment/views_handler_field_comment_username.inc	6 Feb 2010 18:23:33 -0000
@@ -7,19 +7,19 @@
   /**
    * Override init function to add uid and homepage fields.
    */
-  function init(&$view, &$data) {
+  public function init(&$view, &$data) {
     parent::init($view, $data);
     $this->additional_fields['uid'] = 'uid';
     $this->additional_fields['homepage'] = 'homepage';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_user'] = array('default' => TRUE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_user'] = array(
       '#title' => t("Link this field to its user or an author's homepage"),
@@ -28,7 +28,7 @@
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_user'])) {
       $account->uid = $values->{$this->aliases['uid']};
       $account->name = $values->{$this->field_alias};
@@ -43,7 +43,7 @@
     }
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 
Index: modules/comment/views_plugin_row_comment_rss.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_plugin_row_comment_rss.inc,v
retrieving revision 1.3.6.2
diff -u -r1.3.6.2 views_plugin_row_comment_rss.inc
--- modules/comment/views_plugin_row_comment_rss.inc	27 Jan 2010 23:28:35 -0000	1.3.6.2
+++ modules/comment/views_plugin_row_comment_rss.inc	6 Feb 2010 18:23:33 -0000
@@ -9,10 +9,10 @@
  * Plugin which formats the comments as RSS items.
  */
 class views_plugin_row_comment_rss extends views_plugin_row {
-   var $base_table = 'comments';
-   var $base_field = 'cid';
+   public $base_table = 'comments';
+   public $base_field = 'cid';
 
-  function render($row) {
+  public function render($row) {
     global $base_url;
 
     // Load the specified comment:
Index: modules/comment/views_handler_field_comment_link_reply.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment_link_reply.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_comment_link_reply.inc
--- modules/comment/views_handler_field_comment_link_reply.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_field_comment_link_reply.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Field handler to present a link to delete a node.
  */
 class views_handler_field_comment_link_reply extends views_handler_field_comment_link {
-  function render($values) {
+  public function render($values) {
     //check for permission to reply to comments
     if (!user_access('post comments')) {
       return;
Index: modules/comment/views_handler_sort_ncs_last_updated.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_sort_ncs_last_updated.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_sort_ncs_last_updated.inc
--- modules/comment/views_handler_sort_ncs_last_updated.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_sort_ncs_last_updated.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Sort handler for the newer of last comment / node updated
  */
 class views_handler_sort_ncs_last_updated extends views_handler_sort_date {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->node_table = $this->query->ensure_table('node', $this->relationship);
     $this->field_alias = $this->query->add_orderby(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->table_alias . ".last_comment_timestamp)", $this->options['order'], $this->table_alias . '_' . $this->field);
Index: modules/comment/views_handler_field_comment_link_delete.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment_link_delete.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_comment_link_delete.inc
--- modules/comment/views_handler_field_comment_link_delete.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_field_comment_link_delete.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Field handler to present a link to delete a node.
  */
 class views_handler_field_comment_link_delete extends views_handler_field_comment_link {
-  function render($values) {
+  public function render($values) {
     //needs permission to administer comments in general
     if (!user_access('administer comments')) {
       return;
Index: modules/comment/views_handler_filter_ncs_last_updated.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_filter_ncs_last_updated.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_ncs_last_updated.inc
--- modules/comment/views_handler_filter_ncs_last_updated.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_filter_ncs_last_updated.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Filter handler for the newer of last comment / node updated
  */
 class views_handler_filter_ncs_last_updated extends views_handler_filter_date {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->node_table = $this->query->ensure_table('node', $this->relationship);
 
Index: modules/comment/views_handler_field_comment_node_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment_node_link.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_handler_field_comment_node_link.inc
--- modules/comment/views_handler_field_comment_node_link.inc	28 Jan 2010 23:18:39 -0000	1.1.6.2
+++ modules/comment/views_handler_field_comment_node_link.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
 * Handler for showing comment module's node link.
  */
 class views_handler_field_comment_node_link extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
 
     // Add the node fields that comment_link will need..
@@ -19,13 +19,13 @@
     );
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['teaser'] = array('default' => 0);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['teaser'] = array(
@@ -37,12 +37,12 @@
 
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     // Build fake $node.
     $node = new stdClass();
     $node->nid      = $values->{$this->aliases['nid']};
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 -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	6 Feb 2010 18:23:33 -0000
@@ -7,7 +7,7 @@
   /**
    * Override init function to provide generic option to link to comment.
    */
-  function init(&$view, &$options) {
+  public function init(&$view, &$options) {
     parent::init($view, $options);
     if (!empty($this->options['link_to_comment'])) {
       $this->additional_fields['cid'] = 'cid';
@@ -15,7 +15,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_comment'] = array('default' => TRUE);
     return $options;
@@ -24,7 +24,7 @@
   /**
    * Provide link-to-comment option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_comment'] = array(
       '#title' => t('Link this field to its comment'),
@@ -34,7 +34,7 @@
     );
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_comment']) && $data !== NULL && $data !== '') {
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['path'] = "node/". $values->{$this->aliases['nid']};
@@ -44,7 +44,7 @@
     return $data;
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 }
Index: modules/comment/views_handler_field_comment_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment_link.inc,v
retrieving revision 1.2
diff -u -r1.2 views_handler_field_comment_link.inc
--- modules/comment/views_handler_field_comment_link.inc	10 Sep 2008 00:16:14 -0000	1.2
+++ modules/comment/views_handler_field_comment_link.inc	6 Feb 2010 18:23:33 -0000
@@ -4,19 +4,19 @@
  * Base field handler to present a link.
  */
 class views_handler_field_comment_link extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['cid'] = 'cid';
     $this->additional_fields['nid'] = 'nid';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['text'] = array('default' => '', 'translatable' => TRUE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['text'] = array(
       '#type' => 'textfield',
@@ -25,12 +25,12 @@
     );
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
     return l($text, "node/" . $values->{$this->aliases['nid']}, array('html' => TRUE, 'fragment' => "comment-" . $values->{$this->aliases['cid']}));
   }
Index: modules/comment/views_handler_sort_comment_thread.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_sort_comment_thread.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_sort_comment_thread.inc
--- modules/comment/views_handler_sort_comment_thread.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_sort_comment_thread.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Sort handler for ordering by thread
  */
 class views_handler_sort_comment_thread extends views_handler_sort {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     //Read comment_render() in comment.module for an explanation of the
Index: modules/comment/views_handler_field_comment_link_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment_link_edit.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_comment_link_edit.inc
--- modules/comment/views_handler_field_comment_link_edit.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_field_comment_link_edit.inc	6 Feb 2010 18:23:33 -0000
@@ -4,12 +4,12 @@
  * Field handler to present a link node edit.
  */
 class views_handler_field_comment_link_edit extends views_handler_field_comment_link {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['uid'] = 'uid';
   }
 
-  function render($values) {
+  public function render($values) {
     // ensure user has access to edit this comment.
     $comment = new stdClass();
     $comment->cid = $values->{$this->aliases['cid']};
Index: modules/comment/views_handler_field_node_new_comments.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_node_new_comments.inc,v
retrieving revision 1.7.4.2
diff -u -r1.7.4.2 views_handler_field_node_new_comments.inc
--- modules/comment/views_handler_field_node_new_comments.inc	9 Nov 2009 22:46:05 -0000	1.7.4.2
+++ modules/comment/views_handler_field_node_new_comments.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Field handler to display the number of new comments
  */
 class views_handler_field_node_new_comments extends views_handler_field_numeric {
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
 
     // translate an older setting:
@@ -15,12 +15,12 @@
     }
   }
 
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields = array('nid' => 'nid', 'type' => 'type');
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['link_to_comment'] = array('default' => TRUE);
@@ -28,7 +28,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_comment'] = array(
       '#title' => t('Link this field to new comments'),
@@ -38,13 +38,13 @@
     );
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
     $this->field_alias = $this->table . '_' . $this->field;
   }
 
-  function pre_render(&$values) {
+  public function pre_render(&$values) {
     global $user;
     if (!$user->uid || empty($values)) {
       return;
@@ -80,7 +80,7 @@
     }
   }
 
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_comment']) && $data !== NULL && $data !== '') {
       $node = new stdClass();
       $node->nid = $values->{$this->aliases['nid']};
@@ -94,7 +94,7 @@
     return $data;
   }
 
-  function render($values) {
+  public function render($values) {
     if (!empty($values->{$this->field_alias})) {
       return $this->render_link(parent::render($values), $values);
     }
Index: modules/comment/views_plugin_row_comment_view.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_plugin_row_comment_view.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_plugin_row_comment_view.inc
--- modules/comment/views_plugin_row_comment_view.inc	28 Jan 2010 00:00:56 -0000	1.1.6.2
+++ modules/comment/views_plugin_row_comment_view.inc	6 Feb 2010 18:23:33 -0000
@@ -9,16 +9,16 @@
  * Plugin which performs a comment_view on the resulting object.
  */
 class views_plugin_row_comment_view extends views_plugin_row {
-  var $base_table = 'comment';
-  var $base_field = 'cid';
+  public $base_table = 'comment';
+  public $base_field = 'cid';
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['links'] = array('default' => TRUE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['links'] = array(
       '#type' => 'checkbox',
       '#title' => t('Display links'),
@@ -26,7 +26,7 @@
     );
   }
 
-  function pre_render($result) {
+  public function pre_render($result) {
     $cids = array();
     $this->comments = array();
 
Index: modules/comment/views_handler_field_ncs_last_updated.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_ncs_last_updated.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_ncs_last_updated.inc
--- modules/comment/views_handler_field_ncs_last_updated.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_field_ncs_last_updated.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Field handler to display the newer of last comment / node updated
  */
 class views_handler_field_ncs_last_updated extends views_handler_field_date {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->node_table = $this->query->ensure_table('node', $this->relationship);
     $this->field_alias = $this->query->add_field(NULL, "GREATEST(" . $this->node_table . ".changed, " . $this->table_alias . ".last_comment_timestamp)", $this->table_alias . '_' . $this->field);
Index: modules/comment/views_handler_field_ncs_last_comment_name.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_ncs_last_comment_name.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_field_ncs_last_comment_name.inc
--- modules/comment/views_handler_field_ncs_last_comment_name.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/comment/views_handler_field_ncs_last_comment_name.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Field handler to present the name of the last comment poster
  */
 class views_handler_field_ncs_last_comment_name extends views_handler_field {
-  function query() {
+  public function query() {
     // last_comment_name only contains data if the user is anonymous. So we
     // have to join in a specially related user table.
     $this->ensure_my_table();
@@ -24,7 +24,7 @@
     $this->uid = $this->query->add_field($this->table_alias, 'last_comment_uid');
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['link_to_user'] = array('default' => TRUE);
@@ -32,7 +32,7 @@
     return $options;
   }
 
-  function render($values) {
+  public function render($values) {
     if (!empty($this->options['link_to_user'])) {
       $account = new stdClass();
       $account->name = $values->{$this->field_alias};
Index: modules/comment/views_handler_sort_ncs_last_comment_name.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_sort_ncs_last_comment_name.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_sort_ncs_last_comment_name.inc
--- modules/comment/views_handler_sort_ncs_last_comment_name.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_sort_ncs_last_comment_name.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * fields
  */
 class views_handler_sort_ncs_last_comment_name extends views_handler_sort {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $join = new views_join();
     $join->construct('users', $this->table_alias, 'last_comment_uid', 'uid');
Index: modules/comment/views_handler_argument_comment_user_uid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_argument_comment_user_uid.inc,v
retrieving revision 1.2.4.2
diff -u -r1.2.4.2 views_handler_argument_comment_user_uid.inc
--- modules/comment/views_handler_argument_comment_user_uid.inc	28 Jan 2010 00:00:56 -0000	1.2.4.2
+++ modules/comment/views_handler_argument_comment_user_uid.inc	6 Feb 2010 18:23:33 -0000
@@ -6,7 +6,7 @@
  * user posted or commented on.
  */
 class views_handler_argument_comment_user_uid extends views_handler_argument {
-  function title() {
+  public function title() {
     if (!$this->argument) {
       $title = variable_get('anonymous', t('Anonymous'));
     }
@@ -20,7 +20,7 @@
     return check_plain($title);
   }
 
-  function default_actions($which = NULL) {
+  public function default_actions($which = NULL) {
     // Disallow summary views on this argument.
     if (!$which) {
       $actions = parent::default_actions();
@@ -34,7 +34,7 @@
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     $subselect = db_select('comment', 'c');
Index: modules/comment/views_handler_field_comment_depth.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/comment/views_handler_field_comment_depth.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_comment_depth.inc
--- modules/comment/views_handler_field_comment_depth.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/comment/views_handler_field_comment_depth.inc	6 Feb 2010 18:23:33 -0000
@@ -7,7 +7,7 @@
   /**
    * Work out the depth of this comment
    */
-  function render($values) {
+  public function render($values) {
     return count(explode('.', $values->comments_thread)) - 1;
   }
 }
Index: help/api-handlers.html
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/help/api-handlers.html,v
retrieving revision 1.4.6.1
diff -u -r1.4.6.1 api-handlers.html
--- help/api-handlers.html	2 Nov 2009 22:01:26 -0000	1.4.6.1
+++ help/api-handlers.html	6 Feb 2010 18:23:33 -0000
@@ -35,7 +35,7 @@
  * Filter by node type
  */
 class views_handler_filter_node_type extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this-&gt;value_options)) {
       $this-&gt;value_title = t('Node type');
       $types = node_get_types();
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 -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	6 Feb 2010 18:23:34 -0000
@@ -7,14 +7,14 @@
   /**
    * Constructor to provide additional field to add.
    */
-  function init(&$view, &$options) {
+  public function init(&$view, &$options) {
     parent::init($view, $options);
     if (!empty($options['link_to_file'])) {
       $this->additional_fields['uri'] = 'uri';
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_file'] = array('default' => FALSE);
     return $options;
@@ -23,7 +23,7 @@
   /**
    * Provide link to file option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_file'] = array(
       '#title' => t('Link this field to download the file'),
@@ -38,7 +38,7 @@
    *
    * Data should be made XSS safe prior to calling this function.
    */
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_file']) && $data !== NULL && $data !== '') {
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['path'] = file_create_url($values->{$this->aliases['uri']});
@@ -47,7 +47,7 @@
     return $data;
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 }
Index: modules/system/views_handler_argument_file_fid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/system/views_handler_argument_file_fid.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_file_fid.inc
--- modules/system/views_handler_argument_file_fid.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/system/views_handler_argument_file_fid.inc	6 Feb 2010 18:23:34 -0000
@@ -7,7 +7,7 @@
   /**
    * Override the behavior of title(). Get the title of the file.
    */
-  function title() {
+  public function title() {
     $title = db_select('files', 'f')
       ->addField('f', 'filename')
       ->condition('fid', $this->argument)
Index: modules/system/views_handler_field_file_status.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/system/views_handler_field_file_status.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_file_status.inc
--- modules/system/views_handler_field_file_status.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/system/views_handler_field_file_status.inc	6 Feb 2010 18:23:34 -0000
@@ -4,7 +4,7 @@
  * Field handler to translate a node type into its readable form.
  */
 class views_handler_field_file_status extends views_handler_field {
-  function render($values) {
+  public function render($values) {
     return _views_file_status($values->{$this->field_alias});
   }
 }
Index: modules/system/views_handler_filter_file_status.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/system/views_handler_filter_file_status.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_file_status.inc
--- modules/system/views_handler_filter_file_status.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/system/views_handler_filter_file_status.inc	6 Feb 2010 18:23:34 -0000
@@ -4,7 +4,7 @@
  * Filter by file status
  */
 class views_handler_filter_file_status extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_options = _views_file_status();
     }
Index: handlers/views_handler_sort_menu_hierarchy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_sort_menu_hierarchy.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_sort_menu_hierarchy.inc
--- handlers/views_handler_sort_menu_hierarchy.inc	3 Sep 2008 19:21:28 -0000	1.1
+++ handlers/views_handler_sort_menu_hierarchy.inc	6 Feb 2010 18:23:33 -0000
@@ -10,7 +10,7 @@
  * @ingroup views_sort_handlers
  */
 class views_handler_sort_menu_hierarchy extends views_handler_sort {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $max_depth = isset($this->definition['max depth']) ? $this->definition['max depth'] : MENU_MAX_DEPTH;
     for ($i = 1; $i <= $max_depth; ++$i) {
Index: handlers/views_handler_filter_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_numeric.inc,v
retrieving revision 1.7.6.1
diff -u -r1.7.6.1 views_handler_filter_numeric.inc
--- handlers/views_handler_filter_numeric.inc	2 Nov 2009 22:01:25 -0000	1.7.6.1
+++ handlers/views_handler_filter_numeric.inc	6 Feb 2010 18:23:33 -0000
@@ -5,8 +5,8 @@
  * Simple filter to handle greater than/less than filters
  */
 class views_handler_filter_numeric extends views_handler_filter {
-  var $no_single = TRUE;
-  function option_definition() {
+  public $no_single = TRUE;
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['value'] = array(
@@ -20,7 +20,7 @@
     return $options;
   }
 
-  function operators() {
+  public function operators() {
     $operators = array(
       '<' => array(
         'title' => t('Is less than'),
@@ -96,7 +96,7 @@
   /**
    * Provide a list of all the numeric operators
    */
-  function operator_options($which = 'title') {
+  public function operator_options($which = 'title') {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
@@ -105,7 +105,7 @@
     return $options;
   }
 
-  function operator_values($values = 1) {
+  public function operator_values($values = 1) {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       if ($info['values'] == $values) {
@@ -118,7 +118,7 @@
   /**
    * Provide a simple textfield for equality
    */
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     $form['value']['#tree'] = TRUE;
 
     // We have to make some choices when creating this as an exposed
@@ -207,7 +207,7 @@
     }
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $field = "$this->table_alias.$this->real_field";
 
@@ -217,7 +217,7 @@
     }
   }
 
-  function op_between($field) {
+  public function op_between($field) {
     if ($this->operator == 'between') {
       $this->query->add_where($this->options['group'], $field, array($this->value['min'], $this->value['max']), 'BETWEEN');
     }
@@ -226,11 +226,11 @@
     }
   }
 
-  function op_simple($field) {
+  public function op_simple($field) {
     $this->query->add_where($this->options['group'], $field, $this->value['value'], $this->operator);
   }
 
-  function op_empty($field) {
+  public function op_empty($field) {
     if ($this->operator == 'empty') {
       $operator = "IS NULL";
     }
@@ -241,7 +241,7 @@
     $this->query->add_where($this->options['group'], $field, NULL, $operator);
   }
 
-  function admin_summary() {
+  public function admin_summary() {
     if (!empty($this->options['exposed'])) {
       return t('exposed');
     }
@@ -260,7 +260,7 @@
   /**
    * Do some minor translation of the exposed input
    */
-  function accept_exposed_input($input) {
+  public function accept_exposed_input($input) {
     if (empty($this->options['exposed'])) {
       return TRUE;
     }
Index: handlers/views_handler_field_url.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_url.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_url.inc
--- handlers/views_handler_field_url.inc	3 Sep 2008 19:21:28 -0000	1.1
+++ handlers/views_handler_field_url.inc	6 Feb 2010 18:23:32 -0000
@@ -7,7 +7,7 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_url extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['display_as_link'] = array('default' => TRUE);
@@ -18,7 +18,7 @@
   /**
    * Provide link to the page being visited.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['display_as_link'] = array(
       '#title' => t('Display as link'),
@@ -27,7 +27,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     if (!empty($this->options['display_as_link'])) {
       return l(check_plain($value), $value, array('html' => TRUE));
Index: handlers/views_handler_filter_string.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_string.inc,v
retrieving revision 1.8.4.1
diff -u -r1.8.4.1 views_handler_filter_string.inc
--- handlers/views_handler_filter_string.inc	2 Nov 2009 22:01:25 -0000	1.8.4.1
+++ handlers/views_handler_filter_string.inc	6 Feb 2010 18:23:33 -0000
@@ -7,9 +7,9 @@
  */
 class views_handler_filter_string extends views_handler_filter {
   // exposed filter options
-  var $no_single = TRUE;
+  public $no_single = TRUE;
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['case'] = array('default' => TRUE);
@@ -22,7 +22,7 @@
    * to add or remove functionality by overriding this function and
    * adding/removing items from this array.
    */
-  function operators() {
+  public function operators() {
     $operators = array(
       '=' => array(
         'title' => t('Is equal to'),
@@ -121,7 +121,7 @@
   /**
    * Build strings from the operators() for 'select' options
    */
-  function operator_options($which = 'title') {
+  public function operator_options($which = 'title') {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
@@ -130,7 +130,7 @@
     return $options;
   }
 
-  function admin_summary() {
+  public function admin_summary() {
     if (!empty($this->options['exposed'])) {
       return t('exposed');
     }
@@ -143,7 +143,7 @@
     return $output;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['case'] = array(
       '#type' => 'checkbox',
@@ -153,7 +153,7 @@
     );
   }
 
-  function operator_values($values = 1) {
+  public function operator_values($values = 1) {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       if (isset($info['values']) && $info['values'] == $values) {
@@ -167,7 +167,7 @@
   /**
    * Provide a simple textfield for equality
    */
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     // We have to make some choices when creating this as an exposed
     // filter form. For example, if the operator is locked and thus
     // not rendered, we can't render dependencies; instead we only
@@ -216,7 +216,7 @@
     }
   }
 
-  function operator() {
+  public function operator() {
     if (!empty($this->options['case'])) {
       return $this->operator;
     }
@@ -232,7 +232,7 @@
    * level of indirection. You will find them in $this->operator
    * and $this->value respectively.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $field = "$this->table_alias.$this->real_field";
 
@@ -242,15 +242,15 @@
     }
   }
 
-  function op_equal($field) {
+  public function op_equal($field) {
     $this->query->add_where($this->options['group'], $field, $this->value, $this->operator());
   }
 
-  function op_contains($field) {
+  public function op_contains($field) {
     $this->query->add_where($this->options['group'], $field, "%$this->value%", 'LIKE');
   }
 
-  function op_word($field, $upper) {
+  public function op_word($field, $upper) {
     $where = $this->operator == 'word' ? db_or() : db_and();
 
     preg_match_all('/ (-?)("[^"]+"|[^" ]+)/i', ' ' . $this->value, $matches, PREG_SET_ORDER);
@@ -283,35 +283,35 @@
     $this->query->add_where($this->options['group'], $where, $values);
   }
 
-  function op_starts($field, $upper) {
+  public function op_starts($field, $upper) {
     $this->query->add_where($this->options['group'], "$upper($field)", $this->value . '%', 'LIKE');
   }
 
-  function op_not_starts($field, $upper) {
+  public function op_not_starts($field, $upper) {
     $this->query->add_where($this->options['group'], "$upper($field)", $this->value . '%', 'NOT LIKE');
   }
 
-  function op_ends($field, $upper) {
+  public function op_ends($field, $upper) {
     $this->query->add_where($this->options['group'], "$upper($field)", '%' . $this->value, 'LIKE');
   }
 
-  function op_not_ends($field, $upper) {
+  public function op_not_ends($field, $upper) {
     $this->query->add_where($this->options['group'], "$upper($field)", '%' . $this->value, 'NOT LIKE');
   }
 
-  function op_not($field, $upper) {
+  public function op_not($field, $upper) {
     $this->query->add_where($this->options['group'], "$upper($field)", '%' . $this->value . '%', 'NOT LIKE');
   }
 
-  function op_shorter($field, $upper) {
+  public function op_shorter($field, $upper) {
     $this->query->add_where($this->options['group'], "LENGTH($upper($field))", $this->value, '<');
   }
 
-  function op_longer($field, $upper) {
+  public function op_longer($field, $upper) {
     $this->query->add_where($this->options['group'], "LENGTH($upper($field))", $this->value, '>');
   }
 
-  function op_empty($field) {
+  public function op_empty($field) {
     if ($this->operator == 'empty') {
       $operator = "IS NULL";
     }
Index: handlers/views_handler_argument_date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_date.inc,v
retrieving revision 1.3.6.2
diff -u -r1.3.6.2 views_handler_argument_date.inc
--- handlers/views_handler_argument_date.inc	18 Nov 2009 20:40:13 -0000	1.3.6.2
+++ handlers/views_handler_argument_date.inc	6 Feb 2010 18:23:32 -0000
@@ -18,13 +18,13 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_date extends views_handler_argument_formula {
-  var $option_name = 'default_argument_date';
-  var $arg_format = 'Y-m-d';
+  public $option_name = 'default_argument_date';
+  public $arg_format = 'Y-m-d';
 
   /**
    * Add an option to set the default value to the current date.
    */
-  function default_argument_form(&$form, &$form_state) {
+  public function default_argument_form(&$form, &$form_state) {
     parent::default_argument_form($form, $form_state);
     $form['default_argument_type']['#options'] += array('date' => t('Current date'));
     $form['default_argument_type']['#options'] += array('node_created' => t("Current node's creation time"));
@@ -34,7 +34,7 @@
    * Set the empty argument value to the current date,
    * formatted appropriately for this argument.
    */
-  function get_default_argument($raw = FALSE) {
+  public function get_default_argument($raw = FALSE) {
     if (!$raw && $this->options['default_argument_type'] == 'date') {
       return date($this->arg_format, REQUEST_TIME);
     }
Index: handlers/views_handler_argument_null.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_null.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_argument_null.inc
--- handlers/views_handler_argument_null.inc	3 Sep 2008 19:21:28 -0000	1.1
+++ handlers/views_handler_argument_null.inc	6 Feb 2010 18:23:32 -0000
@@ -4,7 +4,7 @@
  * Argument handler that ignores the argument.
  */
 class views_handler_argument_null extends views_handler_argument {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['must_not_be'] = array('default' => FALSE);
     return $options;
@@ -14,7 +14,7 @@
    * Override options_form() so that only the relevant options
    * are displayed to the user.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['must_not_be'] = array(
       '#type' => 'checkbox',
@@ -31,7 +31,7 @@
    * Override default_actions() to remove actions that don't
    * make sense for a null argument.
    */
-  function default_actions($which = NULL) {
+  public function default_actions($which = NULL) {
     if ($which) {
       if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) {
         return parent::default_actions($which);
@@ -44,7 +44,7 @@
     return $actions;
   }
 
-  function validate_argument_basic($arg) {
+  public function validate_argument_basic($arg) {
     if (!empty($this->options['must_not_be'])) {
       return !isset($arg);
     }
@@ -56,5 +56,5 @@
    * Override the behavior of query() to prevent the query
    * from being changed in any way.
    */
-  function query() {}
+  public function query() {}
 }
Index: handlers/views_handler_sort_formula.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_sort_formula.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_sort_formula.inc
--- handlers/views_handler_sort_formula.inc	3 Sep 2008 19:21:28 -0000	1.1
+++ handlers/views_handler_sort_formula.inc	6 Feb 2010 18:23:33 -0000
@@ -18,7 +18,7 @@
   /**
    * Constructor to take the formula this sorts on.
    */
-  function construct() {
+  public function construct() {
     $this->formula = $this->definition['formula'];
     if (is_array($this->formula) && !isset($this->formula['default'])) {
       $this->error = t('views_handler_sort_formula missing default: @formula', array('@formula' => var_export($this->formula, TRUE)));
@@ -28,7 +28,7 @@
   /**
    * Called to add the sort to a query.
    */
-  function query() {
+  public function query() {
     if (is_array($this->formula)) {
       global $db_type;
       if (isset($this->formula[$db_type])) {
Index: handlers/views_handler_argument_formula.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_formula.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_formula.inc
--- handlers/views_handler_argument_formula.inc	2 Nov 2009 22:01:25 -0000	1.1.6.1
+++ handlers/views_handler_argument_formula.inc	6 Feb 2010 18:23:32 -0000
@@ -11,11 +11,11 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_formula extends views_handler_argument {
-  var $formula = NULL;
+  public $formula = NULL;
   /**
    * Constructor
    */
-  function construct() {
+  public function construct() {
     parent::construct();
 
     if (!empty($this->definition['formula'])) {
@@ -23,14 +23,14 @@
     }
   }
 
-  function get_formula() {
+  public function get_formula() {
     return str_replace('***table***', $this->table_alias, $this->formula);
   }
 
   /**
    * Build the summary query based on a formula
    */
-  function summary_query() {
+  public function summary_query() {
     $this->ensure_my_table();
     // Now that our table is secure, get our formula.
     $formula = $this->get_formula();
@@ -45,7 +45,7 @@
   /**
    * Build the query based upon the formula
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     // Now that our table is secure, get our formula.
     $formula = $this->get_formula();
Index: handlers/views_handler_field_boolean.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_boolean.inc,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 views_handler_field_boolean.inc
--- handlers/views_handler_field_boolean.inc	2 Nov 2009 22:01:25 -0000	1.3.4.1
+++ handlers/views_handler_field_boolean.inc	6 Feb 2010 18:23:32 -0000
@@ -9,7 +9,7 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_boolean extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['type'] = array('default' => 'yes-no');
@@ -18,7 +18,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['type'] = array(
       '#type' => 'select',
@@ -38,7 +38,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     if (!empty($this->options['not'])) {
       $value = !$value;
Index: handlers/views_handler_filter_date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_date.inc,v
retrieving revision 1.3.6.1
diff -u -r1.3.6.1 views_handler_filter_date.inc
--- handlers/views_handler_filter_date.inc	2 Nov 2009 22:01:25 -0000	1.3.6.1
+++ handlers/views_handler_filter_date.inc	6 Feb 2010 18:23:32 -0000
@@ -5,7 +5,7 @@
  * Filter to handle dates stored as a timestamp.
  */
 class views_handler_filter_date extends views_handler_filter_numeric {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     // value is already set up properly, we're just adding our new field to it.
@@ -17,7 +17,7 @@
   /**
    * Add a type selector to the value form
    */
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     if (empty($form_state['exposed'])) {
       $form['value']['type'] = array(
         '#type' => 'radios',
@@ -32,7 +32,7 @@
     parent::value_form($form, $form_state);
   }
 
-  function options_validate(&$form, &$form_state) {
+  public function options_validate(&$form, &$form_state) {
     parent::options_validate($form, $form_state);
 
     if (!empty($form_state['values']['options']['expose']['optional'])) {
@@ -43,7 +43,7 @@
     $this->validate_valid_time($form['value'], $form_state['values']['options']['operator'], $form_state['values']['options']['value']);
   }
 
-  function exposed_validate(&$form, &$form_state) {
+  public function exposed_validate(&$form, &$form_state) {
     if (empty($this->options['exposed'])) {
       return;
     }
@@ -68,7 +68,7 @@
   /**
    * Validate that the time values convert to something usable.
    */
-  function validate_valid_time(&$form, $operator, $value) {
+  public function validate_valid_time(&$form, $operator, $value) {
     $operators = $this->operators();
 
     if ($operators[$operator]['values'] == 1) {
@@ -89,7 +89,7 @@
     }
   }
 
-  function accept_exposed_input($input) {
+  public function accept_exposed_input($input) {
     if (empty($this->options['exposed'])) {
       return TRUE;
     }
@@ -123,7 +123,7 @@
     return $rc;
   }
 
-  function op_between($field) {
+  public function op_between($field) {
     if ($this->operator == 'between') {
       $a = intval(strtotime($this->value['min'], 0));
       $b = intval(strtotime($this->value['max'], 0));
@@ -142,7 +142,7 @@
     $this->query->add_where($this->options['group'], $field, array($a, $b), 'BETWEEN');
   }
 
-  function op_simple($field) {
+  public function op_simple($field) {
     $value = intval(strtotime($this->value['value'], 0));
     if (!empty($this->value['type']) && $this->value['type'] == 'offset') {
       $value = '***CURRENT_TIME***' . sprintf('%+d', $value); // keep sign
Index: handlers/views_handler_filter_boolean_operator_string.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_boolean_operator_string.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_filter_boolean_operator_string.inc
--- handlers/views_handler_filter_boolean_operator_string.inc	2 Nov 2009 22:01:25 -0000	1.2.4.1
+++ handlers/views_handler_filter_boolean_operator_string.inc	6 Feb 2010 18:23:32 -0000
@@ -10,7 +10,7 @@
  * - label: (REQUIRED) The label for the checkbox.
  */
 class views_handler_filter_boolean_operator_string extends views_handler_filter_boolean_operator {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $where = "$this->table_alias.$this->real_field ";
 
Index: handlers/views_handler_filter_many_to_one.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_many_to_one.inc,v
retrieving revision 1.2.4.2
diff -u -r1.2.4.2 views_handler_filter_many_to_one.inc
--- handlers/views_handler_filter_many_to_one.inc	7 Dec 2009 19:02:58 -0000	1.2.4.2
+++ handlers/views_handler_filter_many_to_one.inc	6 Feb 2010 18:23:32 -0000
@@ -10,12 +10,12 @@
  * to provide something that isn't just a select list.
  */
 class views_handler_filter_many_to_one extends views_handler_filter_in_operator {
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
     $this->helper = new views_many_to_one_helper($this);
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['operator']['default'] = 'or';
@@ -24,7 +24,7 @@
     return $options;
   }
 
-  function operators() {
+  public function operators() {
     $operators = array(
       'or' => array(
         'title' => t('Is one of'),
@@ -72,8 +72,8 @@
     return $operators;
   }
 
-  var $value_form_type = 'select';
-  function value_form(&$form, &$form_state) {
+  public $value_form_type = 'select';
+  public function value_form(&$form, &$form_state) {
     parent::value_form($form, $form_state);
 
     if (empty($form_state['exposed'])) {
@@ -85,7 +85,7 @@
    * Override ensure_my_table so we can control how this joins in.
    * The operator actually has influence over joining.
    */
-  function ensure_my_table() {
+  public function ensure_my_table() {
     // Defer to helper if the operator specifies it.
     $info = $this->operators();
     if (isset($info[$this->operator]['ensure_my_table']) && $info[$this->operator]['ensure_my_table'] == 'helper') {
@@ -95,7 +95,7 @@
     return parent::ensure_my_table();
   }
 
-  function op_helper() {
+  public function op_helper() {
     if (empty($this->value)) {
       return;
     }
Index: handlers/views_handler_sort_date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_sort_date.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_sort_date.inc
--- handlers/views_handler_sort_date.inc	3 Sep 2008 19:21:28 -0000	1.1
+++ handlers/views_handler_sort_date.inc	6 Feb 2010 18:23:33 -0000
@@ -10,7 +10,7 @@
  * @ingroup views_sort_handlers
  */
 class views_handler_sort_date extends views_handler_sort {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['granularity'] = array('default' => 'second');
@@ -18,7 +18,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['granularity'] = array(
@@ -40,7 +40,7 @@
   /**
    * Called to add the sort to a query.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     switch ($this->options['granularity']) {
       case 'second':
Index: handlers/views_handler_sort.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_sort.inc,v
retrieving revision 1.2.4.2
diff -u -r1.2.4.2 views_handler_sort.inc
--- handlers/views_handler_sort.inc	23 Dec 2009 20:37:13 -0000	1.2.4.2
+++ handlers/views_handler_sort.inc	6 Feb 2010 18:23:33 -0000
@@ -14,18 +14,18 @@
   /**
    * Determine if a sort can be exposed.
    */
-  function can_expose() { return TRUE; }
+  public function can_expose() { return TRUE; }
 
   /**
    * Called to add the sort to a query.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     // Add the field.
     $this->query->add_orderby($this->table_alias, $this->real_field, $this->options['order']);
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['order'] = array('default' => 'ASC');
@@ -41,7 +41,7 @@
   /**
    * Display whether or not the sort order is ascending or descending
    */
-  function admin_summary() {
+  public function admin_summary() {
     if (!empty($this->options['exposed'])) {
       return t('Exposed');
     }
@@ -61,7 +61,7 @@
   /**
    * Basic options for all sort criteria
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     if ($this->can_expose()) {
       $this->show_expose_button($form, $form_state);
     }
@@ -76,7 +76,7 @@
   /**
    * Simple validate handler
    */
-  function options_validate(&$form, &$form_state) {
+  public function options_validate(&$form, &$form_state) {
     $this->sort_validate($form, $form_state);
     if (!empty($this->options['exposed'])) {
       $this->expose_validate($form, $form_state);
@@ -87,7 +87,7 @@
   /**
    * Simple submit handler
    */
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     unset($form_state['values']['expose_button']); // don't store this.
     $this->sort_submit($form, $form_state);
     if (!empty($this->options['exposed'])) {
@@ -98,7 +98,7 @@
   /**
    * Shortcut to display the value form.
    */
-  function show_sort_form(&$form, &$form_state) {
+  public function show_sort_form(&$form, &$form_state) {
     $options = $this->sort_options();
     if (!empty($options)) {
       $form['order'] = array(
@@ -109,26 +109,26 @@
     }
   }
 
-  function sort_validate(&$form, &$form_state) { }
+  public function sort_validate(&$form, &$form_state) { }
 
-  function sort_submit(&$form, &$form_state) { }
+  public function sort_submit(&$form, &$form_state) { }
 
   /**
    * Provide a list of options for the default sort form.
    * Should be overridden by classes that don't override sort_form
    */
-  function sort_options() { 
+  public function sort_options() {
     return array(
-      'ASC' => t('Sort ascending'), 
+      'ASC' => t('Sort ascending'),
       'DESC' => t('Sort descending'),
-    ); 
+    );
   }
 
   /**
    * Since all exposed sorts are grouped into one select box.
    * We don't return nothing when views call to exposed_form()
-   */ 
-  function exposed_form(&$form, &$form_state) { }
+   */
+  public function exposed_form(&$form, &$form_state) { }
 
   /**
    * Handle the 'left' side fo the exposed options form.
@@ -142,11 +142,11 @@
       '#size' => 40,
    );
   }
-  
+
   /**
    * Handle the 'right' side fo the exposed options form.
    */
-  function expose_form_right(&$form, &$form_state) {
+  public function expose_form_right(&$form, &$form_state) {
     $form['expose']['order'] = array(
       '#type' => 'value',
       '#value' => 'ASC',
@@ -156,7 +156,7 @@
   /**
    * Provide default options for exposed sorts.
    */
-  function expose_options() {
+  public function expose_options() {
     $this->options['expose'] = array(
       'order' => $this->options['order'],
       'label' => $this->ui_name(),
@@ -168,13 +168,13 @@
  * A special handler to take the place of missing or broken handlers.
  */
 class views_handler_sort_broken extends views_handler_sort {
-  function ui_name($short = FALSE) {
+  public function ui_name($short = FALSE) {
     return t('Broken/missing handler');
   }
 
-  function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
-  function options_form(&$form, &$form_state) {
+  public function ensure_my_table() { /* No table to ensure! */ }
+  public function query() { /* No query to run */ }
+  public function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#markup' => '<div class="form-item description">' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '</div>',
     );
@@ -183,7 +183,7 @@
   /**
    * Determine if the handler is considered 'broken'
    */
-  function broken() { return TRUE; }
+  public function broken() { return TRUE; }
 }
 
 
Index: handlers/views_handler_filter_boolean_operator.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_boolean_operator.inc,v
retrieving revision 1.6.4.3
diff -u -r1.6.4.3 views_handler_filter_boolean_operator.inc
--- handlers/views_handler_filter_boolean_operator.inc	28 Jan 2010 17:16:40 -0000	1.6.4.3
+++ handlers/views_handler_filter_boolean_operator.inc	6 Feb 2010 18:23:32 -0000
@@ -12,13 +12,13 @@
  */
 class views_handler_filter_boolean_operator extends views_handler_filter {
   // exposed filter options
-  var $no_single = TRUE;
+  public $no_single = TRUE;
   // Don't display empty space where the operator would be.
-  var $no_operator = TRUE;
+  public $no_operator = TRUE;
   // Whether to accept NULL as a false value or not
-  var $accept_null = FALSE;
+  public $accept_null = FALSE;
 
-  function construct() {
+  public function construct() {
     $this->value_value = t('True');
     if (isset($this->definition['label'])) {
       $this->value_value = $this->definition['label'];
@@ -42,7 +42,7 @@
    * dynamic for some reason, child classes should use a guard to reduce
    * database hits as much as possible.
    */
-  function get_value_options() {
+  public function get_value_options() {
     if (isset($this->definition['type'])) {
       if ($this->definition['type'] == 'yes-no') {
         $this->value_options = array(1 => t('Yes'), 0 => t('No'));
@@ -58,7 +58,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['value']['default'] = FALSE;
@@ -66,11 +66,11 @@
     return $options;
   }
 
-  function operator_form(&$form, &$form_state) {
+  public function operator_form(&$form, &$form_state) {
     $form['operator'] = array();
   }
 
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     if (empty($this->value_options)) {
       // Initialize the array of possible values for this filter.
       $this->get_value_options();
@@ -103,13 +103,13 @@
     }
   }
 
-  function value_validate(&$form, &$form_state) {
+  public function value_validate(&$form, &$form_state) {
     if ($form_state['values']['options']['value'] == 'All' && empty($form_state['values']['options']['expose']['optional'])) {
       form_set_error('value', t('You must select a value unless this is an optional exposed filter.'));
     }
   }
 
-  function admin_summary() {
+  public function admin_summary() {
     if (!empty($this->options['exposed'])) {
       return t('exposed');
     }
@@ -123,14 +123,14 @@
     return $this->value_options[!empty($this->value)];
   }
 
-  function expose_options() {
+  public function expose_options() {
     parent::expose_options();
     $this->options['expose']['operator'] = '';
     $this->options['expose']['label'] = $this->value_value;
     $this->options['expose']['optional'] = FALSE;
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $field = "$this->table_alias.$this->real_field";
 
Index: handlers/views_handler_field_counter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_counter.inc,v
retrieving revision 1.3.4.2
diff -u -r1.3.4.2 views_handler_field_counter.inc
--- handlers/views_handler_field_counter.inc	6 Feb 2010 13:29:48 -0000	1.3.4.2
+++ handlers/views_handler_field_counter.inc	6 Feb 2010 18:23:32 -0000
@@ -2,13 +2,13 @@
 // $Id: views_handler_field_counter.inc,v 1.3.4.2 2010/02/06 13:29:48 dereine Exp $
 
 class views_handler_field_counter extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['counter_start'] = array('default' => 1);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['counter_start'] = array(
@@ -21,11 +21,11 @@
     );
   }
 
-  function query() {
+  public function query() {
     // do nothing -- to override the parent query.
   }
 
-  function render($values) {
+  public function render($values) {
     // Note:  1 is subtracted from the counter start value below because the
     // counter value is incremented by 1 at the end of this function.
     $count = is_numeric($this->options['counter_start']) ? $this->options['counter_start'] - 1 : 0;
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.2
diff -u -r1.3.6.2 views_handler_field_markup.inc
--- handlers/views_handler_field_markup.inc	18 Nov 2009 22:08:35 -0000	1.3.6.2
+++ handlers/views_handler_field_markup.inc	6 Feb 2010 18:23:32 -0000
@@ -15,7 +15,7 @@
   /**
    * Constructor; calls to base object constructor.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
 
     $this->format = $this->definition['format'];
@@ -26,7 +26,7 @@
     }
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     $format = is_numeric($this->format) ? $this->format : $values->{$this->aliases['format']};
     if ($value) {
@@ -34,7 +34,7 @@
     }
   }
 
-  function element_type() {
+  public function element_type() {
     if (isset($this->definition['element type'])) {
       return $this->definition['element type'];
     }
Index: handlers/views_handler_filter_in_operator.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_in_operator.inc,v
retrieving revision 1.12.4.2
diff -u -r1.12.4.2 views_handler_filter_in_operator.inc
--- handlers/views_handler_filter_in_operator.inc	25 Nov 2009 17:37:07 -0000	1.12.4.2
+++ handlers/views_handler_filter_in_operator.inc	6 Feb 2010 18:23:32 -0000
@@ -8,9 +8,9 @@
  *
  */
 class views_handler_filter_in_operator extends views_handler_filter {
-  var $value_form_type = 'checkboxes';
+  public $value_form_type = 'checkboxes';
 
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->value_title = t('Options');
     $this->value_options = NULL;
@@ -24,7 +24,7 @@
    * This can use a guard to be used to reduce database hits as much as
    * possible.
    */
-  function get_value_options() {
+  public function get_value_options() {
     if (isset($this->value_options)) {
       return;
     }
@@ -37,12 +37,12 @@
     }
   }
 
-  function expose_options() {
+  public function expose_options() {
     parent::expose_options();
     $this->options['expose']['reduce'] = FALSE;
   }
 
-  function expose_form_right(&$form, &$form_state) {
+  public function expose_form_right(&$form, &$form_state) {
     parent::expose_form_right($form, $form_state);
     $form['expose']['reduce'] = array(
       '#type' => 'checkbox',
@@ -52,7 +52,7 @@
     );
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['operator']['default'] = 'IN';
@@ -66,7 +66,7 @@
    * to add or remove functionality by overriding this function and
    * adding/removing items from this array.
    */
-  function operators() {
+  public function operators() {
     $operators = array(
       'IN' => array(
         'title' => t('Is one of'),
@@ -107,7 +107,7 @@
   /**
    * Build strings from the operators() for 'select' options
    */
-  function operator_options($which = 'title') {
+  public function operator_options($which = 'title') {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
@@ -116,7 +116,7 @@
     return $options;
   }
 
-  function operator_values($values = 1) {
+  public function operator_values($values = 1) {
     $options = array();
     foreach ($this->operators() as $id => $info) {
       if (isset($info['values']) && $info['values'] == $values) {
@@ -127,7 +127,7 @@
     return $options;
   }
 
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     $form['value'] = array();
 
     $this->get_value_options();
@@ -214,7 +214,7 @@
   /**
    * When using exposed filters, we may be required to reduce the set.
    */
-  function reduce_value_options($input = NULL) {
+  public function reduce_value_options($input = NULL) {
     if (!isset($input)) {
       $input = $this->value_options;
     }
@@ -242,7 +242,7 @@
     return $options;
   }
 
-  function accept_exposed_input($input) {
+  public function accept_exposed_input($input) {
     // A very special override because the All state for this type of
     // filter could have a default:
     if (empty($this->options['exposed'])) {
@@ -261,7 +261,7 @@
     return parent::accept_exposed_input($input);
   }
 
-  function value_submit($form, &$form_state) {
+  public function value_submit($form, &$form_state) {
     // Drupal's FAPI system automatically puts '0' in for any checkbox that
     // was not set, and the key to the checkbox if it is set.
     // Unfortunately, this means that if the key to that checkbox is 0,
@@ -274,7 +274,7 @@
     $form_state['values']['options']['value'] = $form['value']['#value'];
   }
 
-  function admin_summary() {
+  public function admin_summary() {
     if (!empty($this->options['exposed'])) {
       return t('exposed');
     }
@@ -321,14 +321,14 @@
     return $operator . (($values !== '') ? ' ' . $values : '');
   }
 
-  function query() {
+  public function query() {
     $info = $this->operators();
     if (!empty($info[$this->operator]['method'])) {
       $this->{$info[$this->operator]['method']}();
     }
   }
 
-  function op_simple() {
+  public function op_simple() {
     if (empty($this->value)) {
       return;
     }
@@ -339,7 +339,7 @@
     $this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field", array_values($this->value), $this->operator);
   }
 
-  function op_empty() {
+  public function op_empty() {
     $this->ensure_my_table();
     if ($this->operator == 'empty') {
       $operator = "IS NULL";
Index: handlers/views_handler_field_date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_date.inc,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 views_handler_field_date.inc
--- handlers/views_handler_field_date.inc	2 Nov 2009 22:01:25 -0000	1.3.4.1
+++ handlers/views_handler_field_date.inc	6 Feb 2010 18:23:32 -0000
@@ -6,7 +6,7 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_date extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['date_format'] = array('default' => 'small');
@@ -15,7 +15,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['date_format'] = array(
@@ -43,7 +43,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     $format = $this->options['date_format'];
     if (in_array($format, array('custom', 'raw time ago', 'time ago', 'raw time span', 'time span'))) {
Index: handlers/views_handler_field_custom.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_custom.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_custom.inc
--- handlers/views_handler_field_custom.inc	30 Jan 2009 00:01:41 -0000	1.1
+++ handlers/views_handler_field_custom.inc	6 Feb 2010 18:23:32 -0000
@@ -7,11 +7,11 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_custom extends views_handler_field {
-  function query() {
+  public function query() {
     // do nothing -- to override the parent query.
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     // Override the alter text option to always alter the text.
@@ -19,7 +19,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     // Remove the checkbox
@@ -28,7 +28,7 @@
     unset($form['alter']['text']['#process']);
   }
 
-  function render($values) {
+  public function render($values) {
     // Nothing to render.
     return '';
   }
Index: handlers/views_handler_argument_many_to_one.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_many_to_one.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_many_to_one.inc
--- handlers/views_handler_argument_many_to_one.inc	2 Nov 2009 22:01:25 -0000	1.1.6.1
+++ handlers/views_handler_argument_many_to_one.inc	6 Feb 2010 18:23:32 -0000
@@ -12,7 +12,7 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_many_to_one extends views_handler_argument {
-  function init(&$view, &$options) {
+  public function init(&$view, &$options) {
     parent::init($view, $options);
     $this->helper = new views_many_to_one_helper($this);
 
@@ -21,7 +21,7 @@
     $this->value = array();
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     if (!empty($this->definition['numeric'])) {
@@ -35,7 +35,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     // allow + for or, , for and
@@ -68,11 +68,11 @@
    * Override ensure_my_table so we can control how this joins in.
    * The operator actually has influence over joining.
    */
-  function ensure_my_table() {
+  public function ensure_my_table() {
     $this->helper->ensure_my_table();
   }
 
-  function query() {
+  public function query() {
     if (empty($this->argument)) {
       parent::ensure_my_table();
       $this->query->add_where(0, "$this->table_alias.$this->real_field", NULL, 'IS NULL');
@@ -90,7 +90,7 @@
     $this->helper->add_filter();
   }
 
-  function title() {
+  public function title() {
     if (!$this->argument) {
       return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : t('Uncategorized');
     }
@@ -116,7 +116,7 @@
     return implode($this->operator == 'or' ? ' + ' : ', ', $this->title_query());
   }
 
-  function summary_query() {
+  public function summary_query() {
     $field = $this->table . '.' . $this->field;
     $join = $this->get_join();
 
@@ -139,7 +139,7 @@
     return $this->summary_basics();
   }
 
-  function summary_argument($data) {
+  public function summary_argument($data) {
     $value = $data->{$this->base_alias};
     if (empty($value)) {
       $value = 0;
@@ -151,7 +151,7 @@
   /**
    * Override for specific title lookups.
    */
-  function title_query() {
+  public function title_query() {
     return $this->value;
   }
 }
Index: handlers/views_handler_sort_random.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_sort_random.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_sort_random.inc
--- handlers/views_handler_sort_random.inc	2 Nov 2009 22:01:25 -0000	1.1.6.1
+++ handlers/views_handler_sort_random.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Handle a random sort.
  */
 class views_handler_sort_random extends views_handler_sort {
-  function query() {
+  public function query() {
     switch (db_driver()) {
       case 'mysql':
       case 'mysqli':
@@ -20,7 +20,7 @@
     }
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['order']['#access'] = FALSE;
   }
Index: handlers/views_handler_field.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field.inc,v
retrieving revision 1.33.4.5
diff -u -r1.33.4.5 views_handler_field.inc
--- handlers/views_handler_field.inc	28 Jan 2010 23:21:17 -0000	1.33.4.5
+++ handlers/views_handler_field.inc	6 Feb 2010 18:23:32 -0000
@@ -19,13 +19,13 @@
  * - click sortable: If TRUE, this field may be click sorted.
  */
 class views_handler_field extends views_handler {
-  var $field_alias = 'unknown';
-  var $aliases = array();
+  public $field_alias = 'unknown';
+  public $aliases = array();
 
   /**
    * Construct a new field handler.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
 
     $this->additional_fields = array();
@@ -44,11 +44,11 @@
    * Fields can set this to FALSE if they do not wish to allow
    * token based rewriting or link-making.
    */
-  function allow_advanced_render() {
+  public function allow_advanced_render() {
     return TRUE;
   }
 
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
 
     $this->options += array(
@@ -59,7 +59,7 @@
   /**
    * Called to add the field to a query.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     // Add the field.
     $this->field_alias = $this->query->add_field($this->table_alias, $this->real_field);
@@ -77,7 +77,7 @@
    * form of
    * @code array('table' => $tablename, 'field' => $fieldname) @endcode
    */
-  function add_additional_fields($fields = NULL) {
+  public function add_additional_fields($fields = NULL) {
     if (!isset($fields)) {
       // notice check
       if (empty($this->additional_fields)) {
@@ -111,21 +111,21 @@
   /**
    * Called to determine what to tell the clicksorter.
    */
-  function click_sort($order) {
+  public function click_sort($order) {
     $this->query->add_orderby($this->table, $this->field, $order, $this->field_alias);
   }
 
   /**
    * Determine if this field is click sortable.
    */
-  function click_sortable() {
+  public function click_sortable() {
     return !empty($this->definition['click sortable']);
   }
 
   /**
    * Get this field's label.
    */
-  function label() {
+  public function label() {
     if (!isset($this->options['label'])) {
       return '';
     }
@@ -135,7 +135,7 @@
   /**
    * Return DIV or SPAN based upon the field's element type.
    */
-  function element_type() {
+  public function element_type() {
     if (isset($this->definition['element type'])) {
       return $this->definition['element type'];
     }
@@ -143,7 +143,7 @@
     return 'span';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['label'] = array('default' => $this->definition['title'], 'translatable' => TRUE);
@@ -178,7 +178,7 @@
    * Default options form that provides the label widget that all fields
    * should have.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['label'] = array(
@@ -420,7 +420,7 @@
   /**
    * Provide extra data to the administration form
    */
-  function admin_summary() {
+  public function admin_summary() {
     return $this->label();
   }
 
@@ -433,7 +433,7 @@
    * @param $values
    *   An array of all objects returned from the query.
    */
-  function pre_render($values) { }
+  public function pre_render($values) { }
 
   /**
    * Render the field.
@@ -441,7 +441,7 @@
    * @param $values
    *   The values retrieved from the database.
    */
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     return check_plain($value);
   }
@@ -452,7 +452,7 @@
    * This renders a field normally, then decides if render-as-link and
    * text-replacement rendering is necessary.
    */
-  function advanced_render($values) {
+  public function advanced_render($values) {
     if ($this->allow_advanced_render() && method_exists($this, 'render_item')) {
       $raw_items = $this->get_items($values);
     }
@@ -499,7 +499,7 @@
    * This is separated out as some fields may render lists, and this allows
    * each item to be handled individually.
    */
-  function render_text($alter) {
+  public function render_text($alter) {
     $value = trim($this->last_render);
     if ($this->options['hide_empty'] && empty($value) && ($value !== 0 || $this->options['empty_zero'])) {
       return '';
@@ -527,7 +527,7 @@
   /**
    * Render this field as altered text, from a fieldset set by the user.
    */
-  function render_altered($alter, $tokens) {
+  public function render_altered($alter, $tokens) {
     // Filter this right away as our substitutions are already sanitized.
     $value = filter_xss_admin($alter['text']);
     $value = strtr($value, $tokens);
@@ -538,7 +538,7 @@
   /**
    * Trim the field down to the specified length.
    */
-  function render_trim_text($alter, $value) {
+  public function render_trim_text($alter, $value) {
     if (!empty($alter['strip_tags'])) {
       $value = strip_tags($value);
       // NOTE: It's possible that some external fields might override the
@@ -576,7 +576,7 @@
    * Render this field as a link, with the info from a fieldset set by
    * the user.
    */
-  function render_as_link($alter, $text, $tokens) {
+  public function render_as_link($alter, $text, $tokens) {
     $value = '';
 
     if (!empty($alter['prefix'])) {
@@ -651,7 +651,7 @@
    * are available and gets their values. This will then be
    * used in one giant str_replace().
    */
-  function get_render_tokens($item) {
+  public function get_render_tokens($item) {
     $tokens = array();
     if (!empty($this->view->build_info['substitutions'])) {
       $tokens = $this->view->build_info['substitutions'];
@@ -696,20 +696,20 @@
    * where token is the field ID and subtoken is the field. If the
    * field ID is terms, then the tokens might be [terms-tid] and [terms-name].
    */
-  function add_self_tokens(&$tokens, $item) { }
+  public function add_self_tokens(&$tokens, $item) { }
 
   /**
    * Document any special tokens this field might use for itself.
    *
    * @see add_self_tokens() for details.
    */
-  function document_self_tokens(&$tokens) { }
+  public function document_self_tokens(&$tokens) { }
 
   /**
    * Call out to the theme() function, which probably just calls render() but
    * allows sites to override output fairly easily.
    */
-  function theme($values) {
+  public function theme($values) {
     return theme($this->theme_functions(),
       array(
         'view' => $this->view,
@@ -718,7 +718,7 @@
       ));
   }
 
-  function theme_functions() {
+  public function theme_functions() {
     $themes = array();
     $hook = 'views_view_field';
 
@@ -749,13 +749,13 @@
  * A special handler to take the place of missing or broken handlers.
  */
 class views_handler_field_broken extends views_handler_field {
-  function ui_name($short = FALSE) {
+  public function ui_name($short = FALSE) {
     return t('Broken/missing handler');
   }
 
-  function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
-  function options_form(&$form, &$form_state) {
+  public function ensure_my_table() { /* No table to ensure! */ }
+  public function query() { /* No query to run */ }
+  public function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#markup' => '<div class="form-item description">' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '</div>',
     );
@@ -764,14 +764,14 @@
   /**
    * Determine if the handler is considered 'broken'
    */
-  function broken() { return TRUE; }
+  public function broken() { return TRUE; }
 }
 
 /**
  * Render a numeric value as a size.
  */
 class views_handler_field_file_size extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['file_size_display'] = array('default' => 'formatted');
@@ -779,7 +779,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['file_size_display'] = array(
       '#title' => t('File size display'),
@@ -791,7 +791,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     if ($values->{$this->field_alias}) {
       switch ($this->options['file_size_display']) {
         case 'bytes':
@@ -811,7 +811,7 @@
  * A handler to run a field through simple XSS filtering
  */
 class views_handler_field_xss extends views_handler_field {
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     return filter_xss($value);
   }
Index: handlers/views_handler_argument_group_by_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/Attic/views_handler_argument_group_by_numeric.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_handler_argument_group_by_numeric.inc
--- handlers/views_handler_argument_group_by_numeric.inc	24 Jan 2010 22:37:52 -0000	1.1.4.2
+++ handlers/views_handler_argument_group_by_numeric.inc	6 Feb 2010 18:23:32 -0000
@@ -5,14 +5,14 @@
  * Simple handler for arguments using group by.
  */
 class views_handler_argument_group_by_numeric extends views_handler_argument  {
-  function query($group_by = FALSE) {
+  public function query($group_by = FALSE) {
     $this->ensure_my_table();
     $field = $this->get_field();
 
     $this->query->add_having(0, $field, $this->argument);
   }
 
-  function ui_name() {
+  public function ui_name() {
     return $this->get_field(parent::ui_name());
   }
 }
Index: handlers/views_handler_filter_float.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_float.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_filter_float.inc
--- handlers/views_handler_filter_float.inc	2 Nov 2009 22:01:25 -0000	1.1.6.1
+++ handlers/views_handler_filter_float.inc	6 Feb 2010 18:23:32 -0000
@@ -7,7 +7,7 @@
  * float numbers.
  */
 class views_handler_filter_float extends views_handler_filter_numeric {
-  function op_between($field) {
+  public function op_between($field) {
     if ($this->operator == 'between') {
       $this->query->add_where($this->options['group'], $field, array($this->value['min'], $this->value['max']), 'BETWEEN');
     }
@@ -16,7 +16,7 @@
     }
   }
 
-  function op_simple($field) {
+  public function op_simple($field) {
     $this->query->add_where($this->options['group'], $field, $this->value['value'], $this->operator);
   }
 }
Index: handlers/views_handler_filter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter.inc,v
retrieving revision 1.10.4.4
diff -u -r1.10.4.4 views_handler_filter.inc
--- handlers/views_handler_filter.inc	23 Dec 2009 19:21:27 -0000	1.10.4.4
+++ handlers/views_handler_filter.inc	6 Feb 2010 18:23:32 -0000
@@ -21,7 +21,7 @@
    * This likely has to be overridden by filters which are more complex
    * than simple operator/value.
    */
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
 
     $this->operator = $this->options['operator'];
@@ -41,7 +41,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['operator'] = array('default' => '=');
@@ -61,14 +61,14 @@
   /**
    * Display the filter on the administrative summary
    */
-  function admin_summary() {
+  public function admin_summary() {
     return check_plain((string) $this->operator) . ' ' . check_plain((string) $this->value);
   }
 
   /**
    * Determine if a filter can be exposed.
    */
-  function can_expose() { return TRUE; }
+  public function can_expose() { return TRUE; }
 
   /**
    * Provide the basic form which calls through to subforms.
@@ -76,7 +76,7 @@
    * or to at least make sure all of the functions in this form
    * are called.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     if ($this->can_expose()) {
       $this->show_expose_button($form, $form_state);
     }
@@ -92,7 +92,7 @@
   /**
    * Simple validate handler
    */
-  function options_validate(&$form, &$form_state) {
+  public function options_validate(&$form, &$form_state) {
     $this->operator_validate($form, $form_state);
     $this->value_validate($form, $form_state);
     if (!empty($this->options['exposed'])) {
@@ -104,7 +104,7 @@
   /**
    * Simple submit handler
    */
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     unset($form_state['values']['expose_button']); // don't store this.
     $this->operator_submit($form, $form_state);
     $this->value_submit($form, $form_state);
@@ -116,7 +116,7 @@
   /**
    * Shortcut to display the operator form.
    */
-  function show_operator_form(&$form, &$form_state) {
+  public function show_operator_form(&$form, &$form_state) {
     $this->operator_form($form, $form_state);
     $form['operator']['#prefix'] = '<div class="views-left-30">';
     $form['operator']['#suffix'] = '</div>';
@@ -128,7 +128,7 @@
    * This may be overridden by child classes, and it must
    * define $form['operator'];
    */
-  function operator_form(&$form, &$form_state) {
+  public function operator_form(&$form, &$form_state) {
     $options = $this->operator_options();
     if (!empty($options)) {
       $form['operator'] = array(
@@ -144,23 +144,23 @@
    * Provide a list of options for the default operator form.
    * Should be overridden by classes that don't override operator_form
    */
-  function operator_options() { return array(); }
+  public function operator_options() { return array(); }
 
   /**
    * Validate the operator form.
    */
-  function operator_validate($form, &$form_state) { }
+  public function operator_validate($form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function operator_submit($form, &$form_state) { }
+  public function operator_submit($form, &$form_state) { }
 
   /**
    * Shortcut to display the value form.
    */
-  function show_value_form(&$form, &$form_state) {
+  public function show_value_form(&$form, &$form_state) {
     $this->value_form($form, $form_state);
     if (empty($this->no_operator)) {
       $form['value']['#prefix'] = '<div class="views-right-70">' . (isset($form['value']['#prefix']) ? $form['value']['#prefix'] : '');
@@ -174,23 +174,23 @@
    * This should be overridden by all child classes and it must
    * define $form['value']
    */
-  function value_form(&$form, &$form_state) { $form['value'] = array(); }
+  public function value_form(&$form, &$form_state) { $form['value'] = array(); }
 
   /**
    * Validate the options form.
    */
-  function value_validate($form, &$form_state) { }
+  public function value_validate($form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function value_submit($form, &$form_state) { }
+  public function value_submit($form, &$form_state) { }
 
   /**
    * Handle the 'left' side fo the exposed options form.
    */
-  function expose_form_left(&$form, &$form_state) {
+  public function expose_form_left(&$form, &$form_state) {
     if (!empty($form['operator']['#type'])) {
       $form['expose']['use_operator'] = array(
         '#type' => 'checkbox',
@@ -235,7 +235,7 @@
   /**
    * Handle the 'right' side fo the exposed options form.
    */
-  function expose_form_right(&$form, &$form_state) {
+  public function expose_form_right(&$form, &$form_state) {
     $form['expose']['optional'] = array(
       '#type' => 'checkbox',
       '#title' => t('Optional'),
@@ -261,7 +261,7 @@
   /**
    * Validate the options form.
    */
-  function expose_validate($form, &$form_state) {
+  public function expose_validate($form, &$form_state) {
     if (empty($this->options['expose']['identifier'])) {
       if (empty($form_state['values']['options']['expose']['identifier'])) {
         form_error($form['expose']['identifier'], t('The identifier is required if the filter is exposed.'));
@@ -280,7 +280,7 @@
   /**
    * Provide default options for exposed filters.
    */
-  function expose_options() {
+  public function expose_options() {
     $this->options['expose'] = array(
       'use_operator' => FALSE,
       'operator' => $this->options['id'] . '_op',
@@ -297,7 +297,7 @@
    *
    * You can override this if it doesn't do what you expect.
    */
-  function exposed_form(&$form, &$form_state) {
+  public function exposed_form(&$form, &$form_state) {
     if (empty($this->options['exposed'])) {
       return;
     }
@@ -345,7 +345,7 @@
    * Make some translations to a form item to make it more suitable to
    * exposing.
    */
-  function exposed_translate(&$form, $type) {
+  public function exposed_translate(&$form, $type) {
     if (!isset($form['#type'])) {
       return;
     }
@@ -384,7 +384,7 @@
    *   - value: The $form key of the value. Set to NULL if no value.
    *   - label: The label to use for this piece.
    */
-  function exposed_info() {
+  public function exposed_info() {
     if (empty($this->options['exposed'])) {
       return;
     }
@@ -400,7 +400,7 @@
    * Check to see if input from the exposed filters should change
    * the behavior of this filter.
    */
-  function accept_exposed_input($input) {
+  public function accept_exposed_input($input) {
     if (empty($this->options['exposed'])) {
       return TRUE;
     }
@@ -439,7 +439,7 @@
     return TRUE;
   }
 
-  function store_exposed_input($input, $status) {
+  public function store_exposed_input($input, $status) {
     if (empty($this->options['exposed']) || empty($this->options['expose']['identifier'])) {
       return TRUE;
     }
@@ -490,7 +490,7 @@
    * level of indirection. You will find them in $this->operator
    * and $this->value respectively.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field", $this->value, $this->operator);
   }
@@ -501,13 +501,13 @@
  * A special handler to take the place of missing or broken handlers.
  */
 class views_handler_filter_broken extends views_handler_filter {
-  function ui_name($short = FALSE) {
+  public function ui_name($short = FALSE) {
     return t('Broken/missing handler');
   }
 
-  function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
-  function options_form(&$form, &$form_state) {
+  public function ensure_my_table() { /* No table to ensure! */ }
+  public function query() { /* No query to run */ }
+  public function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#markup' => '<div class="form-item description">' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '</div>',
     );
@@ -516,7 +516,7 @@
   /**
    * Determine if the handler is considered 'broken'
    */
-  function broken() { return TRUE; }
+  public function broken() { return TRUE; }
 }
 
 
Index: handlers/views_handler_field_group_by_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/Attic/views_handler_field_group_by_numeric.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_handler_field_group_by_numeric.inc
--- handlers/views_handler_field_group_by_numeric.inc	24 Jan 2010 22:37:52 -0000	1.1.4.2
+++ handlers/views_handler_field_group_by_numeric.inc	6 Feb 2010 18:23:32 -0000
@@ -5,7 +5,7 @@
  * Handler for GROUP BY on simple numeric fields.
  */
 class views_handler_field_group_by_numeric extends views_handler_field {
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
 
     // Initialize the original handler.
@@ -16,7 +16,7 @@
   /**
    * Called to add the field to a query.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     // Add the field, taking care of any aggregation that may affect it.
     $params = array(
@@ -31,7 +31,7 @@
   /**
    * Called to determine what to tell the clicksorter.
    */
-  function click_sort($order) {
+  public function click_sort($order) {
     $params = array(
       'function' => $this->options['group_type'],
     );
@@ -39,7 +39,7 @@
     $this->query->add_orderby($this->table, $this->field, $order, $this->field_alias, $params);
   }
 
-  function ui_name() {
+  public function ui_name() {
     return $this->get_field(parent::ui_name());
   }
 }
Index: handlers/views_handler_sort_group_by_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/Attic/views_handler_sort_group_by_numeric.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_handler_sort_group_by_numeric.inc
--- handlers/views_handler_sort_group_by_numeric.inc	24 Jan 2010 22:37:52 -0000	1.1.4.2
+++ handlers/views_handler_sort_group_by_numeric.inc	6 Feb 2010 18:23:33 -0000
@@ -4,7 +4,7 @@
  * Handler for GROUP BY on simple numeric fields.
  */
 class views_handler_sort_group_by_numeric extends views_handler_sort {
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
 
     // Initialize the original handler.
@@ -15,7 +15,7 @@
   /**
    * Called to add the field to a query.
    */
-  function query() {
+  public function query() {
     $params = array(
       'function' => $this->options['group_type'],
     );
@@ -23,7 +23,7 @@
     $this->query->add_orderby($this->table, $this->field, $this->options['order'], NULL, $params);
   }
 
-  function ui_name() {
+  public function ui_name() {
     return $this->get_field(parent::ui_name());
   }
 }
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.7
diff -u -r1.9.4.7 views_handler_argument.inc
--- handlers/views_handler_argument.inc	29 Jan 2010 00:18:54 -0000	1.9.4.7
+++ handlers/views_handler_argument.inc	6 Feb 2010 18:23:32 -0000
@@ -31,11 +31,12 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument extends views_handler {
-  var $name_field = NULL;
+  public $name_field = NULL;
+
   /**
    * Constructor
    */
-  function construct() {
+  public function construct() {
     parent::construct();
 
     if (!empty($this->definition['name field'])) {
@@ -46,7 +47,7 @@
     }
   }
 
-  function init(&$view, &$options) {
+  public function init(&$view, &$options) {
     parent::init($view, $options);
   }
 
@@ -57,19 +58,19 @@
    * The breadcrumb will be in the form of an array, with the keys being
    * the path and the value being the already sanitized title of the path.
    */
-  function set_breadcrumb(&$breadcrumb) { }
+  public function set_breadcrumb(&$breadcrumb) { }
 
   /**
    * Determine if the argument can generate a breadcrumb
    *
    * @return TRUE/FALSE
    */
-  function uses_breadcrumb() {
+  public function uses_breadcrumb() {
     $info = $this->default_actions($this->options['default_action']);
     return !empty($info['breadcrumb']);
   }
 
-  function is_wildcard($arg = NULL) {
+  public function is_wildcard($arg = NULL) {
     if (!isset($arg)) {
       $arg = $this->argument;
     }
@@ -77,7 +78,7 @@
     return !empty($this->options['wildcard']) && $this->options['wildcard'] === $arg;
   }
 
-  function wildcard_title() {
+  public function wildcard_title() {
     return $this->options['wildcard_substitution'];
   }
 
@@ -86,13 +87,13 @@
    *
    * @return TRUE/FALSE
    */
-  function needs_style_plugin() {
+  public function needs_style_plugin() {
     $info = $this->default_actions($this->options['default_action']);
     $validate_info = $this->default_actions($this->options['validate_fail']);
     return !empty($info['style plugin']) || !empty($validate_info['style plugin']);
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['default_action'] = array('default' => 'ignore');
@@ -111,7 +112,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $defaults = $this->default_actions();
 
     $form['title'] = array(
@@ -254,7 +255,7 @@
     );
   }
 
-  function options_validate(&$form, &$form_state) {
+  public function options_validate(&$form, &$form_state) {
     if (empty($form_state['values']['options'])) {
       return;
     }
@@ -274,7 +275,7 @@
 
   }
 
-  function options_submit(&$form, &$form_state) {
+  public function options_submit(&$form, &$form_state) {
     if (empty($form_state['values']['options'])) {
       return;
     }
@@ -305,7 +306,7 @@
    *
    * Override this method to provide additional (or fewer) default behaviors.
    */
-  function default_actions($which = NULL) {
+  public function default_actions($which = NULL) {
     $defaults = array(
       'ignore' => array(
         'title' => t('Display all values'),
@@ -373,7 +374,7 @@
    * Provide a form for selecting the default argument when the
    * default action is set to provide default argument.
    */
-  function default_argument_form(&$form, &$form_state) {
+  public function default_argument_form(&$form, &$form_state) {
     $plugins = views_fetch_plugin_data('argument default');
     $options = array();
 
@@ -438,7 +439,7 @@
    *   A boolean value; if TRUE, continue building this view. If FALSE,
    *   building the view will be aborted here.
    */
-  function default_action($info = NULL) {
+  public function default_action($info = NULL) {
     if (!isset($info)) {
       $info = $this->default_actions($this->options['default_action']);
     }
@@ -458,7 +459,7 @@
   /**
    * How to act if validation failes
    */
-  function validate_fail() {
+  public function validate_fail() {
     $info = $this->default_actions($this->options['validate_fail']);
     return $this->default_action($info);
   }
@@ -468,7 +469,7 @@
    * If an argument was expected and was not given, in this case, simply
    * ignore the argument entirely.
    */
-  function default_ignore() {
+  public function default_ignore() {
     return TRUE;
   }
 
@@ -478,7 +479,7 @@
    * If an argument was expected and was not given, in this case, report
    * the view as 'not found' or hide it.
    */
-  function default_not_found() {
+  public function default_not_found() {
     // Set a failure condition and let the display manager handle it.
     $this->view->build_info['fail'] = TRUE;
     return FALSE;
@@ -490,7 +491,7 @@
    * If an argument was expected and was not given, in this case, display
    * the view's empty text
    */
-  function default_empty() {
+  public function default_empty() {
     // We return with no query; this will force the empty text.
     $this->view->built = TRUE;
     $this->view->executed = TRUE;
@@ -502,14 +503,14 @@
    * This just returns true. The view argument builder will know where
    * to find the argument from.
    */
-  function default_default() {
+  public function default_default() {
     return TRUE;
   }
 
   /**
    * Determine if the argument is set to provide a default argument.
    */
-  function has_default_argument() {
+  public function has_default_argument() {
     $info = $this->default_actions($this->options['default_action']);
     return !empty($info['has default argument']);
   }
@@ -517,7 +518,7 @@
   /**
    * Get a default argument, if available.
    */
-  function get_default_argument() {
+  public function get_default_argument() {
     $plugin = $this->get_plugin('argument default');
     if ($plugin) {
       return $plugin->get_argument();
@@ -530,7 +531,7 @@
    * If an argument was expected and was not given, in this case, display
    * a summary query.
    */
-  function default_summary($order, $by = NULL) {
+  public function default_summary($order, $by = NULL) {
     $this->view->build_info['summary'] = TRUE;
     $this->view->build_info['summary_level'] = $this->options['id'];
 
@@ -564,7 +565,7 @@
    * @return
    *   The alias used to get the number of records (count) for this entry.
    */
-  function summary_query() {
+  public function summary_query() {
     $this->ensure_my_table();
     // Add the field.
     $this->base_alias = $this->query->add_field($this->table_alias, $this->real_field);
@@ -577,7 +578,7 @@
    * Add the name field, which is the field displayed in summary queries.
    * This is often used when the argument is numeric.
    */
-  function summary_name_field() {
+  public function summary_name_field() {
     // Add the 'name' field. For example, if this is a uid argument, the
     // name field would be 'name' (i.e, the username).
 
@@ -612,7 +613,7 @@
    * Some basic summary behavior that doesn't need to be repeated as much as
    * code that goes into summary_query()
    */
-  function summary_basics($count_field = TRUE) {
+  public function summary_basics($count_field = TRUE) {
     // Add the number of nodes counter
     $distinct = ($this->view->display_handler->get_option('distinct') && empty($this->query->no_distinct));
 
@@ -634,7 +635,7 @@
    * @param $order
    *   The order selected in the UI.
    */
-  function summary_sort($order, $by = NULL) {
+  public function summary_sort($order, $by = NULL) {
     $this->query->add_orderby(NULL, NULL, $order, (!empty($by) ? $by : $this->name_alias));
   }
 
@@ -646,7 +647,7 @@
    * @param $data
    *   The query results for the row.
    */
-  function summary_argument($data) {
+  public function summary_argument($data) {
     return $data->{$this->base_alias};
   }
 
@@ -657,7 +658,7 @@
    * @param $data
    *   The query results for the row.
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     $value = $data->{$this->name_alias};
     if (empty($value) && !empty($this->definition['empty field name'])) {
       $value = $this->definition['empty field name'];
@@ -670,7 +671,7 @@
    *
    * The argument sent may be found at $this->argument.
    */
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->query->add_where(0, "$this->table_alias.$this->real_field", $this->argument);
   }
@@ -680,7 +681,7 @@
    *
    * This usually needs to be overridden to provide a proper title.
    */
-  function title() {
+  public function title() {
     return check_plain($this->argument);
   }
 
@@ -688,7 +689,7 @@
    * Called by the view object to get the title. This may be set by a
    * validator so we don't necessarily call through to title().
    */
-  function get_title() {
+  public function get_title() {
     if (isset($this->validated_title)) {
       return $this->validated_title;
     }
@@ -700,7 +701,7 @@
   /**
    * Validate that this argument works. By default, all arguments are valid.
    */
-  function validate_arg($arg) {
+  public function validate_arg($arg) {
     // By using % in URLs, arguments could be validated twice; this eases
     // that pain.
     if (isset($this->argument_validated)) {
@@ -731,7 +732,7 @@
    * argument fails to validate, but there is an action to take anyway,
    * then validation cannot actually fail.
    */
-  function validate_argument($arg) {
+  public function validate_argument($arg) {
     $validate_info = $this->default_actions($this->options['validate_fail']);
     if (empty($validate_info['hard fail'])) {
       return TRUE;
@@ -756,7 +757,7 @@
    * validator only checks to see if the argument is not NULL
    * or is numeric if the definition says it's numeric.
    */
-  function validate_argument_basic($arg) {
+  public function validate_argument_basic($arg) {
     if (!isset($arg) || $arg === '') {
       return FALSE;
     }
@@ -773,7 +774,7 @@
    *
    * @return TRUE if it successfully validates; FALSE if it does not.
    */
-  function set_argument($arg) {
+  public function set_argument($arg) {
     $this->argument = $arg;
     return $this->validate_arg($arg);
   }
@@ -781,7 +782,7 @@
   /**
    * Get the value of this argument.
    */
-  function get_value() {
+  public function get_value() {
     // If we already processed this argument, we're done.
     if (isset($this->argument)) {
       return $this->argument;
@@ -821,7 +822,7 @@
    * Arguments can have styles for the summary view. This special export
    * handler makes sure this works properly.
    */
-  function export_style($indent, $prefix, $storage, $option, $definition, $parents) {
+  public function export_style($indent, $prefix, $storage, $option, $definition, $parents) {
     $output = '';
     $name = $storage[$option];
     $options = $storage['style_options'];
@@ -845,7 +846,7 @@
    * Arguments can have styles for the summary view. This special export
    * handler makes sure this works properly.
    */
-  function export_plugin($indent, $prefix, $storage, $option, $definition, $parents) {
+  public function export_plugin($indent, $prefix, $storage, $option, $definition, $parents) {
     $output = '';
     if ($option == 'default_argument_type') {
       $type = 'argument default';
@@ -872,7 +873,7 @@
   /**
    * Get the display or row plugin, if it exists.
    */
-  function get_plugin($type = 'argument default', $name = NULL) {
+  public function get_plugin($type = 'argument default', $name = NULL) {
     $options = array();
     switch ($type) {
       case 'argument default':
@@ -908,13 +909,13 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_broken extends views_handler_argument {
-  function ui_name($short = FALSE) {
+  public function ui_name($short = FALSE) {
     return t('Broken/missing handler');
   }
 
-  function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
-  function options_form(&$form, &$form_state) {
+  public function ensure_my_table() { /* No table to ensure! */ }
+  public function query() { /* No query to run */ }
+  public function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#markup' => '<div class="form-item description">' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '</div>',
     );
@@ -923,7 +924,7 @@
   /**
    * Determine if the handler is considered 'broken'
    */
-  function broken() { return TRUE; }
+  public function broken() { return TRUE; }
 }
 
 /**
Index: handlers/views_handler_argument_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_numeric.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_argument_numeric.inc
--- handlers/views_handler_argument_numeric.inc	2 Nov 2009 22:01:25 -0000	1.1.6.1
+++ handlers/views_handler_argument_numeric.inc	6 Feb 2010 18:23:32 -0000
@@ -12,7 +12,7 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_numeric extends views_handler_argument {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['break_phrase'] = array('default' => FALSE);
@@ -21,7 +21,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     // allow + for or, , for and
@@ -40,7 +40,7 @@
     );
   }
 
-  function title() {
+  public function title() {
     if (!$this->argument) {
       return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : t('Uncategorized');
     }
@@ -67,11 +67,11 @@
   /**
    * Override for specific title lookups.
    */
-  function title_query() {
+  public function title_query() {
     return $this->value;
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
 
     if (!empty($this->options['break_phrase'])) {
Index: handlers/views_handler_filter_equality.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_filter_equality.inc,v
retrieving revision 1.2
diff -u -r1.2 views_handler_filter_equality.inc
--- handlers/views_handler_filter_equality.inc	10 Sep 2008 01:08:06 -0000	1.2
+++ handlers/views_handler_filter_equality.inc	6 Feb 2010 18:23:32 -0000
@@ -5,12 +5,12 @@
  */
 class views_handler_filter_equality extends views_handler_filter {
   // exposed filter options
-  var $no_single = TRUE;
+  public $no_single = TRUE;
 
   /**
    * Provide simple equality operator
    */
-  function operator_options() {
+  public function operator_options() {
     return array(
       '=' => t('Is equal to'),
       '!=' => t('Is not equal to'),
@@ -20,7 +20,7 @@
   /**
    * Provide a simple textfield for equality
    */
-  function value_form(&$form, &$form_state) {
+  public function value_form(&$form, &$form_state) {
     $form['value'] = array(
       '#type' => 'textfield',
       '#title' => t('Value'),
Index: handlers/views_handler_argument_string.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_argument_string.inc,v
retrieving revision 1.5.4.1
diff -u -r1.5.4.1 views_handler_argument_string.inc
--- handlers/views_handler_argument_string.inc	2 Nov 2009 22:01:25 -0000	1.5.4.1
+++ handlers/views_handler_argument_string.inc	6 Feb 2010 18:23:32 -0000
@@ -8,7 +8,7 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_string extends views_handler_argument {
-  function init(&$view, &$options) {
+  public function init(&$view, &$options) {
     parent::init($view, $options);
     if (!empty($this->definition['many to one'])) {
       $this->helper = new views_many_to_one_helper($this);
@@ -19,7 +19,7 @@
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['glossary'] = array('default' => FALSE);
@@ -36,7 +36,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['glossary'] = array(
@@ -108,7 +108,7 @@
   /**
    * Build the summary query based on a string
    */
-  function summary_query() {
+  public function summary_query() {
     if (empty($this->definition['many to one'])) {
       $this->ensure_my_table();
     }
@@ -136,14 +136,14 @@
    *
    * $this->ensure_my_table() MUST have been called prior to this.
    */
-  function get_formula() {
+  public function get_formula() {
     return "SUBSTR($this->table_alias.$this->real_field, 1, " . intval($this->options['limit']) . ")";
   }
 
   /**
    * Build the query based upon the formula
    */
-  function query() {
+  public function query() {
     $argument = $this->argument;
     if (!empty($this->options['transform_dash'])) {
       $argument = strtr($argument, '-', ' ');
@@ -170,7 +170,7 @@
     $this->query->add_where(0, $field, $argument);
   }
 
-  function summary_argument($data) {
+  public function summary_argument($data) {
     $value = $this->case_transform($data->{$this->base_alias}, 'path_case');
     if (!empty($this->options['transform_dash'])) {
       $value = strtr($value, ' ', '-');
@@ -178,9 +178,9 @@
     return $value;
   }
 
-  function case_transform($string, $option) {
+  public function case_transform($string, $option) {
 		global $multibyte;
-		
+
     switch ($this->options[$option]) {
       default:
         return $string;
@@ -199,7 +199,7 @@
     }
   }
 
-  function title() {
+  public function title() {
     $title = $this->case_transform($this->argument, 'case');
     if (!empty($this->options['transform_dash'])) {
       $title = strtr($title, '-', ' ');
@@ -208,7 +208,7 @@
     return check_plain($title);
   }
 
-  function summary_name($data) {
+  public function summary_name($data) {
     return $this->case_transform(parent::summary_name($data), 'case');
   }
 
Index: handlers/views_handler_filter_group_by_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/Attic/views_handler_filter_group_by_numeric.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_handler_filter_group_by_numeric.inc
--- handlers/views_handler_filter_group_by_numeric.inc	24 Jan 2010 22:37:52 -0000	1.1.4.2
+++ handlers/views_handler_filter_group_by_numeric.inc	6 Feb 2010 18:23:32 -0000
@@ -5,7 +5,7 @@
  * Simple filter to handle greater than/less than filters
  */
 class views_handler_filter_group_by_numeric extends views_handler_filter_numeric {
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $field = $this->get_field();
 
@@ -14,7 +14,7 @@
       $this->{$info[$this->operator]['method']}($field);
     }
   }
-  function op_between($field) {
+  public function op_between($field) {
     if ($this->operator == 'between') {
       $this->query->add_having($this->options['group'], $field, $this->value['min'], '>=');
       $this->query->add_having($this->options['group'], $field, $this->value['max'], '<=');
@@ -25,11 +25,11 @@
     }
   }
 
-  function op_simple($field) {
+  public function op_simple($field) {
     $this->query->add_having($this->options['group'], $field, $this->value['value'], $this->operator);
   }
 
-  function op_empty($field) {
+  public function op_empty($field) {
     if ($this->operator == 'empty') {
       $operator = "IS NULL";
     }
@@ -40,7 +40,7 @@
     $this->query->add_having($this->options['group'], $field, NULL, $operator);
   }
 
-  function ui_name() {
+  public function ui_name() {
     return $this->get_field(parent::ui_name());
   }
 }
Index: handlers/views_handler_field_numeric.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_numeric.inc,v
retrieving revision 1.6.4.1
diff -u -r1.6.4.1 views_handler_field_numeric.inc
--- handlers/views_handler_field_numeric.inc	2 Nov 2009 22:01:25 -0000	1.6.4.1
+++ handlers/views_handler_field_numeric.inc	6 Feb 2010 18:23:32 -0000
@@ -10,7 +10,7 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_numeric extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['set_precision'] = array('default' => FALSE);
@@ -23,7 +23,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     if (!empty($this->definition['float'])) {
@@ -71,7 +71,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     if (!empty($this->options['set_precision'])) {
       $value = number_format($value, $this->options['precision'], $this->options['decimal'], $this->options['separator']);
Index: handlers/views_handler_field_prerender_list.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_field_prerender_list.inc,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 views_handler_field_prerender_list.inc
--- handlers/views_handler_field_prerender_list.inc	2 Nov 2009 22:01:25 -0000	1.3.4.1
+++ handlers/views_handler_field_prerender_list.inc	6 Feb 2010 18:23:32 -0000
@@ -12,7 +12,7 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_prerender_list extends views_handler_field {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['type'] = array('default' => 'separator');
@@ -21,7 +21,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['type'] = array(
       '#type' => 'radios',
@@ -50,7 +50,7 @@
    * yet or won't update their prerender list fields. If a render_item method
    * exists, this will not get used by advanced_render.
    */
-  function render($values) {
+  public function render($values) {
     $field = $values->{$this->field_alias};
     if (!empty($this->items[$field])) {
       if ($this->options['type'] == 'separator') {
@@ -73,7 +73,7 @@
    * When using advanced render, each possible item in the list is rendered
    * individually. Then the items are all pasted together.
    */
-  function render_items($items) {
+  public function render_items($items) {
     if (!empty($items)) {
       if ($this->options['type'] == 'separator') {
         return implode(check_plain($this->options['separator']), $items);
@@ -99,7 +99,7 @@
    * is to be made. Additionally, items that might be turned into tokens
    * should also be in this array.
    */
-  function get_items($values) {
+  public function get_items($values) {
     $field = $values->{$this->field_alias};
     if (!empty($this->items[$field])) {
       return $this->items[$field];
@@ -114,7 +114,7 @@
    * By default, advanced rendering will NOT be allowed if the class
    * inheriting from this does not implement a 'render_items' method.
    */
-  function allow_advanced_render() {
+  public function allow_advanced_render() {
     // Note that the advanced render bits also use the presence of
     // this method to determine if it needs to render items as a list.
     return method_exists($this, 'render_item');
Index: handlers/views_handler_relationship.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/handlers/views_handler_relationship.inc,v
retrieving revision 1.4.4.2
diff -u -r1.4.4.2 views_handler_relationship.inc
--- handlers/views_handler_relationship.inc	9 Nov 2009 22:49:56 -0000	1.4.4.2
+++ handlers/views_handler_relationship.inc	6 Feb 2010 18:23:33 -0000
@@ -38,7 +38,7 @@
    * Init handler to let relationships live on tables other than
    * the table they operate on.
    */
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     parent::init($view, $options);
     if (isset($this->definition['relationship table'])) {
       $this->table = $this->definition['relationship table'];
@@ -51,14 +51,14 @@
   /**
    * Get this field's label.
    */
-  function label() {
+  public function label() {
     if (!isset($this->options['label'])) {
       return $this->ui_name();
     }
     return $this->options['label'];
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $label = !empty($this->definition['label']) ? $this->definition['label'] : $this->definition['field'];
@@ -72,7 +72,7 @@
    * Default options form that provides the label widget that all fields
    * should have.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['label'] = array(
       '#type' => 'textfield',
       '#title' => t('Label'),
@@ -91,7 +91,7 @@
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  public function query() {
     // Figure out what base table this relationship brings to the party.
     $table_data = views_fetch_data($this->definition['base']);
     $base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
@@ -129,13 +129,13 @@
  * A special handler to take the place of missing or broken handlers.
  */
 class views_handler_relationship_broken extends views_handler_relationship {
-  function ui_name($short = FALSE) {
+  public function ui_name($short = FALSE) {
     return t('Broken/missing handler');
   }
 
-  function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
-  function options_form(&$form, &$form_state) {
+  public function ensure_my_table() { /* No table to ensure! */ }
+  public function query() { /* No query to run */ }
+  public function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#markup' => '<div class="form-item description">' . t('The handler for this item is broken or missing and cannot be used. If a module provided the handler and was disabled, re-enabling the module may restore it. Otherwise, you should probably delete this item.') . '</div>',
     );
@@ -144,7 +144,7 @@
   /**
    * Determine if the handler is considered 'broken'
    */
-  function broken() { return TRUE; }
+  public function broken() { return TRUE; }
 }
 
 /**
Index: modules/aggregator/views_plugin_row_aggregator_rss.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator/views_plugin_row_aggregator_rss.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_plugin_row_aggregator_rss.inc
--- modules/aggregator/views_plugin_row_aggregator_rss.inc	27 Jan 2010 23:28:35 -0000	1.1.6.2
+++ modules/aggregator/views_plugin_row_aggregator_rss.inc	6 Feb 2010 18:23:33 -0000
@@ -9,10 +9,10 @@
  * Plugin which loads an aggregator item and formats it as an RSS item.
  */
 class views_plugin_row_aggregator_rss extends views_plugin_row {
-  var $base_table = 'aggregator_item';
-  var $base_field = 'iid';
+  public $base_table = 'aggregator_item';
+  public $base_field = 'iid';
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['item_length'] = array('default' => 'default');
@@ -20,7 +20,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['item_length'] = array(
       '#type' => 'select',
       '#title' => t('Display type'),
@@ -34,7 +34,7 @@
     );
   }
 
-  function render($row) {
+  public function render($row) {
     $iid =  $row->{$this->field_alias};
     $sql =  "SELECT ai.iid, ai.fid, ai.title, ai.link, ai.author, ai.description, ";
     $sql .= "ai.timestamp, ai.guid, af.title AS feed_title, ai.link AS feed_LINK ";
Index: modules/aggregator/views_handler_field_aggregator_category.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator/views_handler_field_aggregator_category.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_handler_field_aggregator_category.inc
--- modules/aggregator/views_handler_field_aggregator_category.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/aggregator/views_handler_field_aggregator_category.inc	6 Feb 2010 18:23:33 -0000
@@ -9,12 +9,12 @@
   /**
    * Constructor to provide additional field to add.
    */
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['cid'] = 'cid';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_category'] = array('default' => FALSE);
     return $options;
@@ -23,7 +23,7 @@
   /**
    * Provide link to category option
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_category'] = array(
       '#title' => t('Link this field to its aggregator category page'),
@@ -38,7 +38,7 @@
    *
    * Data should be made XSS safe prior to calling this function.
    */
-  function render_link($data, $values) {
+  public function render_link($data, $values) {
     if (!empty($this->options['link_to_category']) && !empty($values->{$this->aliases['cid']}) && $data !== NULL && $data !== '') {
       $cid = $values->{$this->aliases['cid']};
       $this->options['alter']['make_link'] = TRUE;
@@ -47,7 +47,7 @@
     return $data;
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link(check_plain($values->{$this->field_alias}), $values);
   }
 }
Index: modules/aggregator/views_handler_argument_aggregator_category_cid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator/views_handler_argument_aggregator_category_cid.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_handler_argument_aggregator_category_cid.inc
--- modules/aggregator/views_handler_argument_aggregator_category_cid.inc	13 Nov 2009 12:36:05 -0000	1.1.6.2
+++ modules/aggregator/views_handler_argument_aggregator_category_cid.inc	6 Feb 2010 18:23:33 -0000
@@ -8,7 +8,7 @@
   /**
    * Override the behavior of title(). Get the title of the category.
    */
-  function title_query() {
+  public function title_query() {
     $titles = array();
 
     $result = db_query("SELECT c.title FROM {aggregator_category} c WHERE c.cid IN (:cid)", array(':cid' => $this->value));
Index: modules/aggregator/views_handler_filter_aggregator_category_cid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator/views_handler_filter_aggregator_category_cid.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_filter_aggregator_category_cid.inc
--- modules/aggregator/views_handler_filter_aggregator_category_cid.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/aggregator/views_handler_filter_aggregator_category_cid.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Filter by aggregator category cid
  */
 class views_handler_filter_aggregator_category_cid extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (isset($this->value_options)) {
       return;
     }
Index: modules/aggregator/views_handler_argument_aggregator_fid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator/views_handler_argument_aggregator_fid.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_argument_aggregator_fid.inc
--- modules/aggregator/views_handler_argument_aggregator_fid.inc	7 Jan 2009 19:38:08 -0000	1.1
+++ modules/aggregator/views_handler_argument_aggregator_fid.inc	6 Feb 2010 18:23:33 -0000
@@ -8,7 +8,7 @@
   /**
    * Override the behavior of title(). Get the title of the feed.
    */
-  function title_query() {
+  public function title_query() {
     $titles = array();
     $placeholders = implode(', ', array_fill(0, sizeof($this->value), '%d'));
 
Index: modules/aggregator/views_handler_field_aggregator_title_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator/views_handler_field_aggregator_title_link.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_aggregator_title_link.inc
--- modules/aggregator/views_handler_field_aggregator_title_link.inc	7 Jan 2009 19:38:08 -0000	1.1
+++ modules/aggregator/views_handler_field_aggregator_title_link.inc	6 Feb 2010 18:23:33 -0000
@@ -6,12 +6,12 @@
  * source article.
  */
 class views_handler_field_aggregator_title_link extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['link'] = 'link';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['display_as_link'] = array('default' => TRUE);
@@ -22,7 +22,7 @@
   /**
    * Provide link to the page being visited.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['display_as_link'] = array(
       '#title' => t('Display as link'),
@@ -31,7 +31,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     $link = $values->{$this->table_alias . '_link'};
     if (!empty($this->options['display_as_link'])) {
Index: modules/aggregator/views_handler_field_aggregator_item_description.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/aggregator/Attic/views_handler_field_aggregator_item_description.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_handler_field_aggregator_item_description.inc
--- modules/aggregator/views_handler_field_aggregator_item_description.inc	29 Jan 2010 07:24:05 -0000	1.1.6.2
+++ modules/aggregator/views_handler_field_aggregator_item_description.inc	6 Feb 2010 18:23:33 -0000
@@ -6,7 +6,7 @@
  */
 
 class views_handler_field_aggregator_item_description extends views_handler_field_xss {
-  function render($values) {
+  public function render($values) {
     $value = $values->{$this->field_alias};
     return aggregator_filter_xss($value);
   }
Index: modules/search/views_handler_filter_search.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/search/views_handler_filter_search.inc,v
retrieving revision 1.5.6.2
diff -u -r1.5.6.2 views_handler_filter_search.inc
--- modules/search/views_handler_filter_search.inc	24 Dec 2009 00:37:00 -0000	1.5.6.2
+++ modules/search/views_handler_filter_search.inc	6 Feb 2010 18:23:34 -0000
@@ -5,8 +5,8 @@
  * Field handler to provide simple renderer that allows linking to a node.
  */
 class views_handler_filter_search extends views_handler_filter {
-  var $no_single = TRUE;
-  function option_definition() {
+  public $no_single = TRUE;
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['operator']['default'] = 'optional';
@@ -17,7 +17,7 @@
   /**
    * Provide simple equality operator
    */
-  function operator_form(&$form, &$form_state) {
+  public function operator_form(&$form, &$form_state) {
     $form['operator'] = array(
       '#type' => 'radios',
       '#title' => t('On empty input'),
@@ -32,7 +32,7 @@
   /**
    * Provide a simple textfield for equality
    */
-  function exposed_form(&$form, &$form_state) {
+  public function exposed_form(&$form, &$form_state) {
     if (isset($this->options['expose']['identifier'])) {
       $key = $this->options['expose']['identifier'];
       $form[$key] = array(
@@ -47,7 +47,7 @@
   /**
    * Validate the options form.
    */
-  function exposed_validate($form, &$form_state) {
+  public function exposed_validate($form, &$form_state) {
     if (!isset($this->options['expose']['identifier'])) {
       return;
     }
@@ -74,7 +74,7 @@
    * level of indirection. You will find them in $this->operator
    * and $this->value respectively.
    */
-  function query() {
+  public function query() {
     if (!isset($this->search_query) || empty($this->search_query[3])) {
       if ($this->operator == 'required') {
         $this->query->add_where($this->options['group'], 'FALSE');
Index: modules/search/views_plugin_row_search_view.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/search/views_plugin_row_search_view.inc,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 views_plugin_row_search_view.inc
--- modules/search/views_plugin_row_search_view.inc	2 Nov 2009 22:01:26 -0000	1.1.6.1
+++ modules/search/views_plugin_row_search_view.inc	6 Feb 2010 18:23:34 -0000
@@ -9,7 +9,7 @@
  * Plugin which performs a node_view on the resulting object.
  */
 class views_plugin_row_search_view extends views_plugin_row {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['score'] = array('default' => TRUE);
@@ -17,7 +17,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['score'] = array(
       '#type' => 'checkbox',
       '#title' => t('Display score'),
@@ -28,7 +28,7 @@
   /**
    * Override the behavior of the render() function.
    */
-  function render($row) {
+  public function render($row) {
     return theme($this->theme_functions(),
       array(
         'view' => $this->view,
Index: modules/search/views_handler_field_search_score.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/search/views_handler_field_search_score.inc,v
retrieving revision 1.2
diff -u -r1.2 views_handler_field_search_score.inc
--- modules/search/views_handler_field_search_score.inc	23 Feb 2009 23:30:38 -0000	1.2
+++ modules/search/views_handler_field_search_score.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Field handler to provide simple renderer that allows linking to a node.
  */
 class views_handler_field_search_score extends views_handler_field_numeric {
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['alternate_sort'] = array('default' => '');
@@ -14,7 +14,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $style_options = $this->view->display_handler->get_option('style_options');
     if (isset($style_options['default']) && $style_options['default'] == $this->options['id']) {
       $handlers = $this->view->display_handler->get_handlers('field');
@@ -42,7 +42,7 @@
     parent::options_form($form, $form_state);
   }
 
-  function query() {
+  public function query() {
     // Check to see if the search filter added 'score' to the table.
     // Our filter stores it as $handler->search_score -- and we also
     // need to check its relationship to make sure that we're using the same
@@ -66,13 +66,13 @@
     }
   }
 
-  function click_sort($order) {
+  public function click_sort($order) {
     if (isset($this->table_alias)) {
        $this->query->add_orderby(NULL, NULL, $order, $this->field_alias);
     }
   }
 
-  function render($values) {
+  public function render($values) {
     // Only render if we exist.
     if (isset($this->table_alias)) {
       return parent::render($values);
Index: modules/search/views_handler_sort_search_score.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/search/views_handler_sort_search_score.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_sort_search_score.inc
--- modules/search/views_handler_sort_search_score.inc	23 Feb 2009 22:19:47 -0000	1.1
+++ modules/search/views_handler_sort_search_score.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Field handler to provide simple renderer that allows linking to a node.
  */
 class views_handler_sort_search_score extends views_handler_sort {
-  function query() {
+  public function query() {
     // Check to see if the search filter added 'score' to the table.
     // Our filter stores it as $handler->search_score -- and we also
     // need to check its relationship to make sure that we're using the same
Index: modules/search/views_handler_argument_search.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/search/Attic/views_handler_argument_search.inc,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 views_handler_argument_search.inc
--- modules/search/views_handler_argument_search.inc	24 Jan 2010 22:37:52 -0000	1.1.2.2
+++ modules/search/views_handler_argument_search.inc	6 Feb 2010 18:23:34 -0000
@@ -9,7 +9,7 @@
   /**
    * Add this argument to the query.
    */
-  function query() {
+  public function query() {
     $this->search_query = search_parse_query($this->argument);
 
     if (!isset($this->search_query) || empty($this->search_query[3])) {
Index: modules/locale/views_handler_field_locale_language.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_field_locale_language.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_locale_language.inc
--- modules/locale/views_handler_field_locale_language.inc	20 Feb 2009 23:02:09 -0000	1.1
+++ modules/locale/views_handler_field_locale_language.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Field handler to translate a language into its readable form.
  */
 class views_handler_field_locale_language extends views_handler_field {
-  function render($values) {
+  public function render($values) {
     $languages = language_list();
     return isset($languages[$values->{$this->field_alias}]) ? $languages[$values->{$this->field_alias}]->name : '';
   }
Index: modules/locale/views_handler_filter_locale_group.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_filter_locale_group.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_locale_group.inc
--- modules/locale/views_handler_filter_locale_group.inc	20 Feb 2009 23:02:09 -0000	1.1
+++ modules/locale/views_handler_filter_locale_group.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Filter by locale group.
  */
 class views_handler_filter_locale_group extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Group');
       $groups = module_invoke_all('locale', 'groups');
Index: modules/locale/views_handler_filter_locale_version.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_filter_locale_version.inc,v
retrieving revision 1.1.6.2
diff -u -r1.1.6.2 views_handler_filter_locale_version.inc
--- modules/locale/views_handler_filter_locale_version.inc	13 Nov 2009 12:36:05 -0000	1.1.6.2
+++ modules/locale/views_handler_filter_locale_version.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Filter by version.
  */
 class views_handler_filter_locale_version extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Version');
       // Enable filtering by the current installed Drupal version.
Index: modules/locale/views_handler_argument_locale_language.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_argument_locale_language.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_argument_locale_language.inc
--- modules/locale/views_handler_argument_locale_language.inc	20 Feb 2009 23:02:09 -0000	1.1
+++ modules/locale/views_handler_argument_locale_language.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Argument handler to accept a language.
  */
 class views_handler_argument_locale_language extends views_handler_argument {
-  function construct() {
+  public function construct() {
     parent::construct('language');
   }
 
@@ -13,7 +13,7 @@
    * Override the behavior of summary_name(). Get the user friendly version
    * of the language.
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     return $this->locale_language($data->{$this->name_alias});
   }
 
@@ -21,11 +21,11 @@
    * Override the behavior of title(). Get the user friendly version
    * of the language.
    */
-  function title() {
+  public function title() {
     return $this->locale_language($this->argument);
   }
 
-  function locale_language($langcode) {
+  public function locale_language($langcode) {
     $languages = locale_language_list();
     return isset($languages[$langcode]) ? $languages[$langcode] : t('Unknown language');
   }
Index: modules/locale/views_handler_field_locale_link_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_field_locale_link_edit.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_locale_link_edit.inc
--- modules/locale/views_handler_field_locale_link_edit.inc	20 Feb 2009 23:02:09 -0000	1.1
+++ modules/locale/views_handler_field_locale_link_edit.inc	6 Feb 2010 18:23:33 -0000
@@ -5,12 +5,12 @@
  * Field handler to present a link to edit a translation.
  */
 class views_handler_field_locale_link_edit extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->additional_fields['lid'] = 'lid';
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['text'] = array('default' => '', 'translatable' => TRUE);
@@ -18,7 +18,7 @@
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['text'] = array(
       '#type' => 'textfield',
@@ -27,12 +27,12 @@
     );
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     // Ensure user has access to edit translations.
     if (!user_access('translate interface')) {
       return;
Index: modules/locale/views_handler_filter_locale_language.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_filter_locale_language.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_locale_language.inc
--- modules/locale/views_handler_filter_locale_language.inc	20 Feb 2009 23:02:09 -0000	1.1
+++ modules/locale/views_handler_filter_locale_language.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Filter by language.
  */
 class views_handler_filter_locale_language extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_title = t('Language');
       $languages = array('***CURRENT_LANGUAGE***' => t("Current user's language"), '***DEFAULT_LANGUAGE***' => t("Default site language"), '***NO_LANGUAGE***' => t('No language'));
Index: modules/locale/views_handler_argument_locale_group.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_argument_locale_group.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_argument_locale_group.inc
--- modules/locale/views_handler_argument_locale_group.inc	20 Feb 2009 23:02:09 -0000	1.1
+++ modules/locale/views_handler_argument_locale_group.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Argument handler to accept a language.
  */
 class views_handler_argument_locale_group extends views_handler_argument {
-  function construct() {
+  public function construct() {
     parent::construct('group');
   }
 
@@ -13,7 +13,7 @@
    * Override the behavior of summary_name(). Get the user friendly version
    * of the group.
    */
-  function summary_name($data) {
+  public function summary_name($data) {
     return $this->locale_group($data->{$this->name_alias});
   }
 
@@ -21,11 +21,11 @@
    * Override the behavior of title(). Get the user friendly version
    * of the language.
    */
-  function title() {
+  public function title() {
     return $this->locale_group($this->argument);
   }
 
-  function locale_group($group) {
+  public function locale_group($group) {
     $groups = module_invoke_all('locale', 'groups');
     // Sort the list.
     asort($groups);
Index: modules/locale/views_handler_field_locale_group.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/locale/views_handler_field_locale_group.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_locale_group.inc
--- modules/locale/views_handler_field_locale_group.inc	20 Feb 2009 23:02:09 -0000	1.1
+++ modules/locale/views_handler_field_locale_group.inc	6 Feb 2010 18:23:33 -0000
@@ -5,7 +5,7 @@
  * Field handler to translate a group into its readable form.
  */
 class views_handler_field_locale_group extends views_handler_field {
-  function render($values) {
+  public function render($values) {
     $groups = module_invoke_all('locale', 'groups');
     // Sort the list.
     asort($groups);
Index: includes/tabs.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/tabs.inc,v
retrieving revision 1.7.6.1
diff -u -r1.7.6.1 tabs.inc
--- includes/tabs.inc	2 Nov 2009 22:01:26 -0000	1.7.6.1
+++ includes/tabs.inc	6 Feb 2010 18:23:33 -0000
@@ -15,9 +15,9 @@
  * - extra: An optional decorative area around the tabs.
  */
 class views_tabset {
-  var $tabs = array();
-  var $extra = '';
-  var $selected = NULL;
+  public $tabs = array();
+  public $extra = '';
+  public $selected = NULL;
 
   /**
    * Add a tab to the tabset.
@@ -33,7 +33,7 @@
    *   If given, this is the body of the tab itself. It will display
    *   when the tab title is clicked on.
    */
-  function add($name, $title = '', $body = '') {
+  public function add($name, $title = '', $body = '') {
     if (is_object($name) && is_subclass_of($name, 'views_tab')) {
       $this->add_tab($name);
     }
@@ -53,7 +53,7 @@
    * @param $tab
    *   A fully populated views_tab object.
    */
-  function add_tab($tab) {
+  public function add_tab($tab) {
     $this->tabs[$tab->name] = $tab;
   }
 
@@ -67,7 +67,7 @@
    * @param $body
    *   The HTML body of the tab.
    */
-  function set($name, $title, $body = NULL) {
+  public function set($name, $title, $body = NULL) {
     if (empty($this->tabs[$name])) {
       return $this->add($name, $title, $body);
     }
@@ -80,7 +80,7 @@
   /**
    * Set the body of a tab.
    */
-  function set_body($name, $body) {
+  public function set_body($name, $body) {
     if (empty($this->tabs[$name])) {
       return $this->add($name, '', $body);
     }
@@ -90,7 +90,7 @@
   /**
    * Add text to the 'extra' region of the tabset.
    */
-  function add_extra($text) {
+  public function add_extra($text) {
     $this->extra .= $text;
   }
 
@@ -100,7 +100,7 @@
    * @param $tab
    *   May be the name of the tab or a views_tab object.
    */
-  function remove($tab) {
+  public function remove($tab) {
     if (is_string($tab)) {
       unset($this->tabs[$tab]);
     }
@@ -112,7 +112,7 @@
   /**
    * Control which tab will be selected when it is rendered.
    */
-  function set_selected($name) {
+  public function set_selected($name) {
     $this->selected = $name;
   }
 
@@ -122,7 +122,7 @@
    * @return
    *   HTML representation of the tabs.
    */
-  function render() {
+  public function render() {
     views_add_js('tabs');
     views_add_css('views-tabs');
 
@@ -140,14 +140,14 @@
  * An object to represent an individual tab within a tabset.
  */
 class views_tab {
-  var $title;
-  var $body;
-  var $name;
+  public $title;
+  public $body;
+  public $name;
 
   /**
    * Construct a new tab.
    */
-  function views_tab($name, $title, $body = NULL) {
+  public function __construct($name, $title, $body = NULL) {
     $this->name = $name;
     $this->title = $title;
     $this->body = $body;
@@ -156,7 +156,7 @@
   /**
    * Generate HTML output for a tab.
    */
-  function render() {
+  public function render() {
     return theme('views_tab', array('body' => $this->body));
   }
 }
Index: includes/handlers.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/handlers.inc,v
retrieving revision 1.119.4.5
diff -u -r1.119.4.5 handlers.inc
--- includes/handlers.inc	6 Feb 2010 16:38:10 -0000	1.119.4.5
+++ includes/handlers.inc	6 Feb 2010 18:23:33 -0000
@@ -169,7 +169,7 @@
  *                    control is provided.
  * - access arguments: An array of arguments for the access callback.
  */
-class views_handler extends views_object {
+abstract class views_handler extends views_object {
   /**
    * init the handler with necessary data.
    * @param $view
@@ -178,7 +178,7 @@
    *   The item from the database; the actual contents of this will vary
    *   based upon the type of handler.
    */
-  function init(&$view, $options) {
+  public function init(&$view, $options) {
     $this->view = &$view;
     $this->unpack_options($this->options, $options);
 
@@ -205,7 +205,7 @@
     $this->query = &$view->query;
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['id'] = array('default' => '');
@@ -220,7 +220,7 @@
   /**
    * Return a string representing this handler's name in the UI.
    */
-  function ui_name($short = FALSE) {
+  public function ui_name($short = FALSE) {
     $title = ($short && isset($this->definition['title short'])) ? $this->definition['title short'] : $this->definition['title'];
     return t('!group: !title', array('!group' => $this->definition['group'], '!title' => $title));
   }
@@ -232,7 +232,7 @@
    * non-standard fields. Because this takes an argument, fields
    * overriding this can just call return parent::get_field($formula)
    */
-  function get_field($field = NULL) {
+  public function get_field($field = NULL) {
     if (!isset($field)) {
       if (!empty($this->formula)) {
         $field = $this->get_formula();
@@ -256,72 +256,72 @@
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) { }
+  public function options_validate($form, &$form_state) { }
 
-  function options_form(&$form, &$form_state) { }
+  public function options_form(&$form, &$form_state) { }
   /**
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) { }
+  public function options_submit($form, &$form_state) { }
 
   /**
    * If a handler has 'extra options' it will get a little settings widget and
    * another form called extra_options.
    */
-  function has_extra_options() { return FALSE; }
+  public function has_extra_options() { return FALSE; }
 
   /**
    * Provide defaults for the handler.
    */
-  function extra_options(&$option) { }
+  public function extra_options(&$option) { }
 
   /**
    * Provide a form for setting options.
    */
-  function extra_options_form(&$form, &$form_state) { }
+  public function extra_options_form(&$form, &$form_state) { }
 
   /**
    * Validate the options form.
    */
-  function extra_options_validate($form, &$form_state) { }
+  public function extra_options_validate($form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function extra_options_submit($form, &$form_state) { }
+  public function extra_options_submit($form, &$form_state) { }
 
   /**
    * Determine if a handler can be exposed.
    */
-  function can_expose() { return FALSE; }
+  public function can_expose() { return FALSE; }
 
   /**
    * Set new exposed option defaults when exposed setting is flipped
    * on.
    */
-  function expose_options() { }
+  public function expose_options() { }
 
   /**
    * Get information about the exposed form for the form renderer.
    */
-  function exposed_info() { }
+  public function exposed_info() { }
 
   /**
    * Render our chunk of the exposed handler form when selecting
    */
-  function exposed_form(&$form, &$form_state) { }
+  public function exposed_form(&$form, &$form_state) { }
 
   /**
    * Validate the exposed handler form
    */
-  function exposed_validate(&$form, &$form_state) { }
+  public function exposed_validate(&$form, &$form_state) { }
 
   /**
    * Submit the exposed handler form
    */
-  function exposed_submit(&$form, &$form_state) { }
+  public function exposed_submit(&$form, &$form_state) { }
 
   /**
    * Overridable form for exposed handler options.
@@ -332,7 +332,7 @@
    * Many handlers will need to override this in order to provide options
    * that are nicely tailored to the given filter.
    */
-  function expose_form(&$form, &$form_state) {
+  public function expose_form(&$form, &$form_state) {
     $form['expose']['start_left'] = array(
       '#markup' => '<div class="views-left-50">',
     );
@@ -354,25 +354,25 @@
     );
   }
 
-  function expose_form_left(&$form, &$form_state) { }
+  public function expose_form_left(&$form, &$form_state) { }
 
-  function expose_form_right(&$form, &$form_state){ }
+  public function expose_form_right(&$form, &$form_state){ }
 
   /**
    * Validate the options form.
    */
-  function expose_validate($form, &$form_state) { }
+  public function expose_validate($form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form exposes prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function expose_submit($form, &$form_state) { }
+  public function expose_submit($form, &$form_state) { }
 
     /**
    * Shortcut to display the expose/hide button.
    */
-  function show_expose_button(&$form, &$form_state) {
+  public function show_expose_button(&$form, &$form_state) {
     $form['expose_button'] = array(
       '#prefix' => '<div class="views-expose clearfix">',
       '#suffix' => '</div>',
@@ -401,7 +401,7 @@
   /**
    * Shortcut to display the exposed options form.
    */
-  function show_expose_form(&$form, &$form_state) {
+  public function show_expose_form(&$form, &$form_state) {
     if (empty($this->options['exposed'])) {
       return;
     }
@@ -430,7 +430,7 @@
   *
   * @return boolean
   */
-  function access() {
+  public function access() {
     if (isset($this->definition['access callback']) && function_exists($this->definition['access callback'])) {
       if (isset($this->definition['access arguments']) && is_array($this->definition['access arguments'])) {
         return call_user_func_array($this->definition['access callback'], $this->definition['access arguments']);
@@ -447,13 +447,13 @@
    * This gives all the handlers some time to set up before any handler has
    * been fully run.
    */
-  function pre_query() { }
+  public function pre_query() { }
 
   /**
    * Called just prior to query(), this lets a handler set up any relationship
    * it needs.
    */
-  function set_relationship() {
+  public function set_relationship() {
     // Ensure this gets set to something.
     $this->relationship = NULL;
 
@@ -484,13 +484,13 @@
    *
    * If we were using PHP5, this would be abstract.
    */
-  function query($group_by = FALSE) { }
+  public function query($group_by = FALSE) { }
 
   /**
    * Ensure the main table for this handler is in the query. This is used
    * a lot.
    */
-  function ensure_my_table() {
+  public function ensure_my_table() {
     if (!isset($this->table_alias)) {
       if (!method_exists($this->query, 'ensure_table')) { vpr_trace(); exit; }
       $this->table_alias = $this->query->ensure_table($this->table, $this->relationship);
@@ -501,14 +501,14 @@
   /**
    * Provide text for the administrative summary
    */
-  function admin_summary() { }
+  public function admin_summary() { }
 
   /**
    * Determine if the argument needs a style plugin.
    *
    * @return TRUE/FALSE
    */
-  function needs_style_plugin() { return FALSE; }
+  public function needs_style_plugin() { return FALSE; }
 
   /**
    * Determine if this item is 'exposed', meaning it provides form elements
@@ -516,19 +516,19 @@
    *
    * @return TRUE/FALSE
    */
-  function is_exposed() {
+  public function is_exposed() {
     return !empty($this->options['exposed']);
   }
 
   /**
    * Take input from exposed handlers and assign to this handler, if necessary.
    */
-  function accept_exposed_input($input) { return TRUE; }
+  public function accept_exposed_input($input) { return TRUE; }
 
   /**
    * If set to remember exposed input in the session, store it there.
    */
-  function store_exposed_input($input, $status) { return TRUE; }
+  public function store_exposed_input($input, $status) { return TRUE; }
 
   /**
    * Get the join object that should be used for this handler.
@@ -537,7 +537,7 @@
    * getting the join if it is necessary to make some changes to it, such
    * as adding an 'extra'.
    */
-  function get_join() {
+  public function get_join() {
     // get the join from this table that links back to the base table.
     // Determine the primary table to seek
     if (empty($this->query->relationships[$this->relationship])) {
@@ -564,13 +564,13 @@
    * @return
    *   Empty array if the handler is valid; an array of error strings if it is not.
    */
-  function validate() { return array(); }
+  public function validate() { return array(); }
 
   /**
    * Determine if the handler is considered 'broken', meaning it's a
    * a placeholder used when a handler can't be found.
    */
-  function broken() { }
+  public function broken() { }
 }
 
 /**
@@ -588,15 +588,15 @@
  *
  */
 class views_many_to_one_helper {
-  function views_many_to_one_helper(&$handler) {
+  public function views_many_to_one_helper(&$handler) {
     $this->handler = &$handler;
   }
 
-  function option_definition(&$options) {
+  public function option_definition(&$options) {
     $options['reduce_duplicates'] = array('default' => FALSE);
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     $form['reduce_duplicates'] = array(
       '#type' => 'checkbox',
       '#title' => t('Reduce duplicates'),
@@ -610,7 +610,7 @@
    * it that option. If it wants us to do this, it must set $helper->formula = TRUE
    * and implement handler->get_formula();
    */
-  function get_field() {
+  public function get_field() {
     if (!empty($this->formula)) {
       return $this->handler->get_formula();
     }
@@ -627,7 +627,7 @@
    * link point and adds *that* as a new relationship and then adds the table to
    * the relationship, if necessary.
    */
-  function add_table($join = NULL, $alias = NULL) {
+  public function add_table($join = NULL, $alias = NULL) {
     // This is used for lookups in the many_to_one table.
     $field = $this->handler->table . '.' . $this->handler->field;
 
@@ -673,7 +673,7 @@
     return $alias;
   }
 
-  function get_join() {
+  public function get_join() {
     return $this->handler->get_join();
   }
 
@@ -681,7 +681,7 @@
    * Provide the proper join for summary queries. This is important in part because
    * it will cooperate with other arguments if possible.
    */
-  function summary_join() {
+  public function summary_join() {
     $field = $this->handler->table . '.' . $this->handler->field;
     $join = $this->get_join();
 
@@ -718,7 +718,7 @@
    * Override ensure_my_table so we can control how this joins in.
    * The operator actually has influence over joining.
    */
-  function ensure_my_table() {
+  public function ensure_my_table() {
     if (!isset($this->handler->table_alias)) {
       // For 'or' if we're not reducing duplicates, we get the absolute simplest:
       $field = $this->handler->table . '.' . $this->handler->field;
@@ -807,7 +807,7 @@
     return $this->handler->table_alias;
   }
 
-  function add_filter() {
+  public function add_filter() {
     if (empty($this->handler->value)) {
       return;
     }
@@ -1185,11 +1185,11 @@
  *   // PHP 4 doesn't call constructors of the base class automatically from a
  *   // constructor of a derived class. It is your responsibility to propagate
  *   // the call to constructors upstream where appropriate.
- *   function construct($table, $left_table, $left_field, $field, $extra = array(), $type = 'LEFT') {
+ *   public function construct($table, $left_table, $left_field, $field, $extra = array(), $type = 'LEFT') {
  *     parent::construct($table, $left_table, $left_field, $field, $extra, $type);
  *   }
  *
- *   function join($table, &$query) {
+ *   public function join($table, &$query) {
  *     $output = parent::join($table, $query);
  *   }
  *   $output .= "AND foo.bar = baz.boing";
@@ -1226,7 +1226,7 @@
   /**
    * Construct the views_join object.
    */
-  function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
+  public function construct($table = NULL, $left_table = NULL, $left_field = NULL, $field = NULL, $extra = array(), $type = 'LEFT') {
     $this->extra_type = 'AND';
     if (!empty($table)) {
       $this->table = $table;
@@ -1266,7 +1266,7 @@
    * @return
    *
    */
-  function build_join($select_query, $table, $view_query) {
+  public function build_join($select_query, $table, $view_query) {
     if (empty($this->definition['table formula'])) {
       $right_table = "{" . $this->table . "}";
     }
Index: includes/plugins.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/plugins.inc,v
retrieving revision 1.156.4.5
diff -u -r1.156.4.5 plugins.inc
--- includes/plugins.inc	6 Feb 2010 13:29:48 -0000	1.156.4.5
+++ includes/plugins.inc	6 Feb 2010 18:23:33 -0000
@@ -360,12 +360,12 @@
 /**
  * Abstract base class to provide interface common to all plugins.
  */
-class views_plugin extends views_object {
+abstract class views_plugin extends views_object {
   /**
    * Init will be called after construct, when the plugin is attached to a
    * view and a display.
    */
-  function init(&$view, &$display) {
+  public function init(&$view, &$display) {
     $this->view = &$view;
     $this->display = &$display;
   }
@@ -373,34 +373,34 @@
   /**
    * Provide a form to edit options for this plugin.
    */
-  function options_form(&$form, &$form_state) { }
+  public function options_form(&$form, &$form_state) { }
 
   /**
    * Validate the options form.
    */
-  function options_validate(&$form, &$form_state) { }
+  public function options_validate(&$form, &$form_state) { }
 
   /**
    * Handle any special handling on the validate form.
    */
-  function options_submit(&$form, &$form_state) { }
+  public function options_submit(&$form, &$form_state) { }
 
   /**
    * Add anything to the query that we might need to.
    */
-  function query() { }
+  public function query() { }
 
   /**
    * Provide a full list of possible theme templates used by this style.
    */
-  function theme_functions() {
+  public function theme_functions() {
     return views_theme_functions($this->definition['theme'], $this->view, $this->display);
   }
 
   /**
    * Provide a list of additional theme functions for the theme information page
    */
-  function additional_theme_functions() {
+  public function additional_theme_functions() {
     $funcs = array();
     if (!empty($this->definition['additional themes'])) {
       foreach ($this->definition['additional themes'] as $theme => $type) {
@@ -417,6 +417,6 @@
    *   An array of error strings to tell the user what is wrong with this
    *   plugin.
    */
-  function validate() { return array(); }
+  public function validate() { return array(); }
 }
 
Index: includes/view.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/view.inc,v
retrieving revision 1.167.4.10
diff -u -r1.167.4.10 view.inc
--- includes/view.inc	6 Feb 2010 16:38:10 -0000	1.167.4.10
+++ includes/view.inc	6 Feb 2010 18:23:33 -0000
@@ -17,42 +17,42 @@
  * functions to build the view query, execute the query and render the output.
  */
 class view extends views_db_object {
-  var $db_table = 'views_view';
-  var $base_table = 'node';
+  public $db_table = 'views_view';
+  public $base_table = 'node';
 
   // State variables
-  var $built = FALSE;
-  var $executed = FALSE;
+  public $built = FALSE;
+  public $executed = FALSE;
 
-  var $args = array();
-  var $build_info = array();
+  public $args = array();
+  public $build_info = array();
 
-  var $use_ajax = FALSE;
+  public $use_ajax = FALSE;
 
   // Where the results of a query will go.
-  var $result = array();
+  public $result = array();
 
   // May be used to override the current page number.
-  var $current_page = NULL;
+  public $current_page = NULL;
 
   // Places to put attached renderings:
-  var $attachment_before = '';
-  var $attachment_after = '';
+  public $attachment_before = '';
+  public $attachment_after = '';
 
   // Exposed widget input
-  var $exposed_data = array();
-  var $exposed_input = array();
+  public $exposed_data = array();
+  public $exposed_input = array();
 
   // Used to store views that were previously running if we recurse.
-  var $old_view = array();
+  public $old_view = array();
 
   // Where the $query object will reside:
-  var $query = NULL;
+  public $query = NULL;
 
   /**
    * Constructor
    */
-  function __construct() {
+  public function __construct() {
     parent::init();
     // Make sure all of our sub objects are arrays.
     foreach ($this->db_objects() as $object) {
@@ -64,7 +64,7 @@
    * Returns a list of the sub-object types used by this view. These types are
    * stored on the display, and are used in the build process.
    */
-  function display_objects() {
+  public function display_objects() {
     return array('argument', 'field', 'sort', 'filter', 'relationship');
   }
 
@@ -75,7 +75,7 @@
    * Note: In PHP5 this should be static, but PHP4 doesn't support static
    * methods.
    */
-  function db_objects() {
+  public function db_objects() {
     return array('display');
   }
 
@@ -83,21 +83,21 @@
    * Set the arguments that come to this view. Usually from the URL
    * but possibly from elsewhere.
    */
-  function set_arguments($args) {
+  public function set_arguments($args) {
     $this->args = $args;
   }
 
   /**
    * Change/Set the current page for the pager.
    */
-  function set_current_page($page) {
+  public function set_current_page($page) {
     $this->current_page = $page;
   }
 
   /**
    * Get the current page from the pager.
    */
-  function get_current_page() {
+  public function get_current_page() {
     if (!empty($this->query->pager)) {
       return $this->query->pager->get_current_page();
     }
@@ -106,7 +106,7 @@
   /**
    * Get the items per page from the pager.
    */
-  function get_items_per_page() {
+  public function get_items_per_page() {
     if (!empty($this->query->pager)) {
       return $this->query->pager->get_items_per_page();
     }
@@ -115,7 +115,7 @@
   /**
    * Get the pager offset from the pager.
    */
-  function get_offset() {
+  public function get_offset() {
     if (!empty($this->query->pager)) {
       return $this->query->pager->get_offset();
     }
@@ -126,7 +126,7 @@
    * tablesorting and exposed filters will be fetched via an AJAX call
    * rather than a page refresh.
    */
-  function set_use_ajax($use_ajax) {
+  public function set_use_ajax($use_ajax) {
     $this->use_ajax = $use_ajax;
   }
 
@@ -134,14 +134,14 @@
    * Set the exposed filters input to an array. If unset they will be taken
    * from $_GET when the time comes.
    */
-  function set_exposed_input($filters) {
+  public function set_exposed_input($filters) {
     $this->exposed_input = $filters;
   }
 
   /**
    * Figure out what the exposed input for this view is.
    */
-  function get_exposed_input() {
+  public function get_exposed_input() {
     // Fill our input either from $_GET or from something previously set on the
     // view.
     if (empty($this->exposed_input)) {
@@ -172,7 +172,7 @@
   /**
    * Set the display for this view and initialize the display handler.
    */
-  function init_display($reset = FALSE) {
+  public function init_display($reset = FALSE) {
     // The default display is always the first one in the list.
     if (isset($this->current_display)) {
       return TRUE;
@@ -216,7 +216,7 @@
    * @param $displays
    *   Either a single display id or an array of display ids.
    */
-  function choose_display($displays) {
+  public function choose_display($displays) {
     if (!is_array($displays)) {
       return $displays;
     }
@@ -238,7 +238,7 @@
    * @param $display_id
    *   The id of the display to mark as current.
    */
-  function set_display($display_id = NULL) {
+  public function set_display($display_id = NULL) {
     // If we have not already initialized the display, do so. But be careful.
     if (empty($this->current_display)) {
       $this->init_display();
@@ -286,7 +286,7 @@
    * Note that arguments may have changed which style plugin we use, so
    * check the view object first, then ask the display handler.
    */
-  function init_style() {
+  public function init_style() {
     if (isset($this->style_plugin)) {
       return is_object($this->style_plugin);
     }
@@ -310,7 +310,7 @@
   /**
    * Acquire and attach all of the handlers.
    */
-  function init_handlers() {
+  public function init_handlers() {
     if (empty($this->inited)) {
       foreach (views_object_types() as $key => $info) {
         $this->_init_handler($key, $info);
@@ -323,7 +323,7 @@
    * Create a list of base tables eligible for this view. Used primarily
    * for the UI. Display must be already initialized.
    */
-  function get_base_tables() {
+  public function get_base_tables() {
     $base_tables = array(
       $this->base_table => TRUE,
       '#global' => TRUE,
@@ -338,7 +338,7 @@
   /**
    * Run the pre_query() on all active handlers.
    */
-  function _pre_query() {
+  public function _pre_query() {
     foreach (views_object_types() as $key => $info) {
       $handlers = &$this->$key;
       $position = 0;
@@ -358,7 +358,7 @@
    * @param $info
    *   The $info from views_object_types for this object.
    */
-  function _init_handler($key, $info) {
+  public function _init_handler($key, $info) {
     // Load the requested items from the display onto the object.
     $this->$key = $this->display_handler->get_handlers($key);
 
@@ -380,7 +380,7 @@
    * also assign data to the appropriate handlers for use in building the
    * query.
    */
-  function render_exposed_form($block = FALSE) {
+  public function render_exposed_form($block = FALSE) {
     // Deal with any exposed filters we may have, before building.
     $form_state = array(
       'view' => &$this,
@@ -415,7 +415,7 @@
   /**
    * Build all the arguments.
    */
-  function _build_arguments() {
+  public function _build_arguments() {
     // Initially, we want to build sorts and fields. This can change, though,
     // if we get a summary view.
     if (empty($this->argument)) {
@@ -518,7 +518,7 @@
   /**
    * Do some common building initialization.
    */
-  function init_query() {
+  public function init_query() {
     if (!empty($this->query)) {
       $class = get_class($this->query);
       if ($class && $class != 'stdClass') {
@@ -544,7 +544,7 @@
   /**
    * Build the query for the view.
    */
-  function build($display_id = NULL) {
+  public function build($display_id = NULL) {
     if (!empty($this->built)) {
       return;
     }
@@ -666,7 +666,7 @@
   /**
    * Internal method to build an individual set of handlers.
    */
-  function _build($key) {
+  public function _build($key) {
     $handlers = &$this->$key;
     foreach ($handlers as $id => $data) {
       if (!empty($handlers[$id]) && is_object($handlers[$id])) {
@@ -687,7 +687,7 @@
   /**
    * Execute the view's query.
    */
-  function execute($display_id = NULL) {
+  public function execute($display_id = NULL) {
     if (empty($this->built)) {
       if (!$this->build($display_id)) {
         return FALSE;
@@ -727,7 +727,7 @@
   /**
    * Render this view for display.
    */
-  function render($display_id = NULL) {
+  public function render($display_id = NULL) {
     $this->execute($display_id);
 
     // Check to see if the build failed.
@@ -821,7 +821,7 @@
   /**
    * Render a specific field via the field ID and the row #.
    */
-  function render_field($field, $row) {
+  public function render_field($field, $row) {
     if (isset($this->field[$field]) && isset($this->result[$row])) {
       return $this->field[$field]->advanced_render($this->result[$row]);
     }
@@ -839,7 +839,7 @@
    *
    * If you simply want to view the display, use view::preview() instead.
    */
-  function execute_display($display_id = NULL, $args = array()) {
+  public function execute_display($display_id = NULL, $args = array()) {
     if (empty($this->current_display) || $this->current_display != $this->choose_display($display_id)) {
       if (!$this->set_display($display_id)) {
         return FALSE;
@@ -862,7 +862,7 @@
    * Can also be called when views are embedded, as this guarantees
    * normalized output.
    */
-  function preview($display_id = NULL, $args = array()) {
+  public function preview($display_id = NULL, $args = array()) {
     if (empty($this->current_display) || $this->current_display != $display_id) {
       if (!$this->set_display($display_id)) {
         return FALSE;
@@ -882,7 +882,7 @@
    * Run attachments and let the display do what it needs to do prior
    * to running.
    */
-  function pre_execute($args = array()) {
+  public function pre_execute($args = array()) {
     $this->old_view[] = views_get_current_view();
     views_set_current_view($this);
     $display_id = $this->current_display;
@@ -908,7 +908,7 @@
   /**
    * Unset the current view, mostly.
    */
-  function post_execute() {
+  public function post_execute() {
     // unset current view so we can be properly destructed later on.
     // Return the previous value in case we're an attachment.
 
@@ -922,7 +922,7 @@
   /**
    * Run attachment displays for the view.
    */
-  function attach_displays() {
+  public function attach_displays() {
     if (!empty($this->is_attachment)) {
       return;
     }
@@ -945,7 +945,7 @@
    * Called to get hook_menu information from the view and the
    * named display handler.
    */
-  function execute_hook_menu($display_id = NULL) {
+  public function execute_hook_menu($display_id = NULL) {
     // Prepare the view with the information we have.
 
     // This was probably already called, but it's good to be safe.
@@ -963,7 +963,7 @@
    * Called to get hook_block information from the view and the
    * named display handler.
    */
-  function execute_hook_block_list($display_id = NULL) {
+  public function execute_hook_block_list($display_id = NULL) {
     // Prepare the view with the information we have.
 
     // This was probably already called, but it's good to be safe.
@@ -981,7 +981,7 @@
    * Determine if the given user has access to the view. Note that
    * this sets the display handler if it hasn't been.
    */
-  function access($displays = NULL, $account = NULL) {
+  public function access($displays = NULL, $account = NULL) {
     if (!isset($this->current_display)) {
       $this->init_display();
     }
@@ -1008,7 +1008,7 @@
    * Get the view's current title. This can change depending upon how it
    * was built.
    */
-  function get_title() {
+  public function get_title() {
     if (empty($this->display_handler)) {
       if (!$this->set_display('default')) {
         return FALSE;
@@ -1029,7 +1029,7 @@
   /**
    * Force the view to build a title.
    */
-  function build_title() {
+  public function build_title() {
     $this->init_display();
     if (empty($this->built)) {
       $this->init_query();
@@ -1044,7 +1044,7 @@
    *
    * This URL will be adjusted for arguments.
    */
-  function get_url($args = NULL, $path = NULL) {
+  public function get_url($args = NULL, $path = NULL) {
     if (!isset($path)) {
       $path = $this->get_path();
     }
@@ -1094,7 +1094,7 @@
   /**
    * Get the base path used for this view.
    */
-  function get_path() {
+  public function get_path() {
     if (!empty($this->override_path)) {
       return $this->override_path;
     }
@@ -1113,7 +1113,7 @@
    * @param $set
    *   If true, use drupal_set_breadcrumb() to install the breadcrumb.
    */
-  function get_breadcrumb($set = FALSE) {
+  public function get_breadcrumb($set = FALSE) {
     // Now that we've built the view, extract the breadcrumb.
     $base = TRUE;
     $breadcrumb = array();
@@ -1144,7 +1144,7 @@
   /**
    * Is this view cacheable?
    */
-  function is_cacheable() {
+  public function is_cacheable() {
     return $this->is_cacheable;
   }
 
@@ -1157,7 +1157,7 @@
    * can do that without forcing a db rewrite by just manipulating
    * $conf. This is kind of evil but it works.
    */
-  function start_query_capture() {
+  public function start_query_capture() {
     global $conf, $queries;
     if (empty($conf['dev_query'])) {
       $this->fix_dev_query = TRUE;
@@ -1179,7 +1179,7 @@
    *
    * @see view::start_query_capture()
    */
-  function end_query_capture() {
+  public function end_query_capture() {
     global $conf, $queries;
     if (!empty($this->fix_dev_query)) {
       $conf['dev_query'] = FALSE;
@@ -1327,7 +1327,7 @@
    * Save the view to the database. If the view does not already exist,
    * A vid will be assigned to the view and also returned from this function.
    */
-  function save() {
+  public function save() {
     if ($this->vid == 'new') {
       $this->vid = NULL;
     }
@@ -1357,7 +1357,7 @@
    * Save a row to the database for the given key, which is one of the
    * keys from view::db_objects()
    */
-  function _save_rows($key) {
+  public function _save_rows($key) {
     $count = 0;
     foreach ($this->$key as $position => $object) {
       $object->position = ++$count;
@@ -1369,7 +1369,7 @@
   /**
    * Delete the view from the database.
    */
-  function delete() {
+  public function delete() {
     if (empty($this->vid)) {
       return;
     }
@@ -1392,7 +1392,7 @@
   /**
    * Export a view as PHP code.
    */
-  function export($indent = '') {
+  public function export($indent = '') {
     $this->init_display();
     $output = '';
     $output .= $this->export_row('view', $indent);
@@ -1422,7 +1422,7 @@
    *
    * I'd call this clone() but it's reserved.
    */
-  function copy() {
+  public function copy() {
     $code = $this->export();
     eval($code);
     return $view;
@@ -1439,7 +1439,7 @@
    *
    * This will completely wipe a view clean so it can be considered fresh.
    */
-  function clone_view() {
+  public function clone_view() {
     $clone = version_compare(phpversion(), '5.0') < 0 ? $this : clone($this);
 
     $keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'query', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'exposed_widgets', 'many_to_one_tables');
@@ -1472,7 +1472,7 @@
    * Unset references so that a $view object may be properly garbage
    * collected.
    */
-  function destroy() {
+  public function destroy() {
     foreach (array_keys($this->display) as $display_id) {
       if (isset($this->display[$display_id]->handler)) {
         $this->display[$display_id]->handler->destroy();
@@ -1526,7 +1526,7 @@
    * @return
    *   TRUE if the view is valid; an array of error strings if it is not.
    */
-  function validate() {
+  public function validate() {
     $this->init_display();
 
     $errors = array();
@@ -1560,7 +1560,7 @@
    *   load. Otherwse, if TRUE values will be filled in from schema
    *   defaults.
    */
-  function init($init = TRUE) {
+  public function init($init = TRUE) {
     if (is_array($init)) {
       return $this->load_row($init);
     }
@@ -1600,7 +1600,7 @@
    * @param $update
    *   If true this will be an UPDATE query. Otherwise it will be an INSERT.
    */
-  function save_row($update = NULL) {
+  public function save_row($update = NULL) {
     $fields = $defs = $values = $serials = array();
     $schema = drupal_get_schema($this->db_table);
 
@@ -1647,7 +1647,7 @@
    *   An object from db_fetch_object. It should contain all of the fields
    *   that are in the schema.
    */
-  function load_row($data) {
+  public function load_row($data) {
     $schema = drupal_get_schema($this->db_table);
 
     // Go through our schema and build correlations.
@@ -1664,7 +1664,7 @@
    * @param $indent
    *   An optional indentation for prettifying nested code.
    */
-  function export_row($identifier = NULL, $indent = '') {
+  public function export_row($identifier = NULL, $indent = '') {
     if (!$identifier) {
       $identifier = $this->db_table;
     }
@@ -1712,7 +1712,7 @@
    *   The key to the display in $view->display, so that the new display
    *   can be easily located.
    */
-  function add_display($type = 'page', $title = NULL, $id = NULL) {
+  public function add_display($type = 'page', $title = NULL, $id = NULL) {
     if (empty($type)) {
       return FALSE;
     }
@@ -1760,7 +1760,7 @@
    * @return
    *   A reference to the new handler object.
    */
-  function &new_display($type = 'page', $title = NULL, $id = NULL) {
+  public function &new_display($type = 'page', $title = NULL, $id = NULL) {
     $id = $this->add_display($type, $title, $id);
 
     // Create a handler
@@ -1788,7 +1788,7 @@
    *
    * These items may be fields, filters, sort criteria, or arguments.
    */
-  function add_item($display_id, $type, $table, $field, $options = array(), $id = NULL) {
+  public function add_item($display_id, $type, $table, $field, $options = array(), $id = NULL) {
     $types = views_object_types();
     $this->set_display($display_id);
 
@@ -1819,7 +1819,7 @@
   /**
    * Get an array of items for the current display.
    */
-  function get_items($type, $display_id = NULL) {
+  public function get_items($type, $display_id = NULL) {
     $this->set_display($display_id);
 
     if (!isset($display_id)) {
@@ -1835,7 +1835,7 @@
    * Get the configuration of an item (field/sort/filter/etc) on a given
    * display.
    */
-  function get_item($display_id, $type, $id) {
+  public function get_item($display_id, $type, $id) {
     // Get info about the types so we can get the right data.
     $types = views_object_types();
     // Initialize the display
@@ -1853,7 +1853,7 @@
    *
    * Pass in NULL for the $item to remove an item.
    */
-  function set_item($display_id, $type, $id, $item) {
+  public function set_item($display_id, $type, $id, $item) {
     // Get info about the types so we can get the right data.
     $types = views_object_types();
     // Initialize the display
@@ -1879,7 +1879,7 @@
    * many, consider getting the item, adding the options and doing
    * set_item yourself.
    */
-  function set_item_option($display_id, $type, $id, $option, $value) {
+  public function set_item_option($display_id, $type, $id, $option, $value) {
     $item = $this->get_item($display_id, $type, $id);
     $item[$option] = $value;
     $this->set_item($display_id, $type, $id, $item);
@@ -1893,12 +1893,12 @@
  * to the behavior of the display at all.
  */
 class views_display extends views_db_object {
-  var $db_table = 'views_display';
-  function views_display($init = TRUE) {
+  public $db_table = 'views_display';
+  public function views_display($init = TRUE) {
     parent::init($init);
   }
 
-  function options($type, $id, $title) {
+  public function options($type, $id, $title) {
     $this->display_plugin = $type;
     $this->id = $id;
     $this->display_title = $title;
Index: includes/base.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/base.inc,v
retrieving revision 1.3.4.3
diff -u -r1.3.4.3 base.inc
--- includes/base.inc	29 Jan 2010 00:14:42 -0000	1.3.4.3
+++ includes/base.inc	6 Feb 2010 18:23:33 -0000
@@ -9,11 +9,12 @@
 /**
  * Basic definition for many views objects
  */
-class views_object {
+abstract class views_object {
   /**
    * Except for displays, options for the object will be held here.
    */
-  var $options = array();
+  public $options = array();
+
   /**
    * Information about options for all kinds of purposes will be held here.
    * @code
@@ -31,33 +32,33 @@
    *  - translate_option_OPTIONNAME -- Special handling for translating data
    *    within the option, if necessary.
    */
-  function option_definition() { return array(); }
+  public function option_definition() { return array(); }
 
   /**
    * Views handlers use a special construct function so that we can more
    * easily construct them with variable arguments.
    */
-  function construct() { $this->set_default_options(); }
+  public function construct() { $this->set_default_options(); }
 
   /**
    * Set default options on this object. Called by the constructor in a
    * complex chain to deal with backward compatibility.
    */
-  function options() { }
+  public function options() { }
 
   /**
    * Set default options.
    * For backward compatibility, it sends the options array; this is a
    * feature that will likely disappear at some point.
    */
-  function set_default_options() {
+  public function set_default_options() {
     $this->_set_option_defaults($this->options, $this->option_definition());
 
     // Retained for complex defaults plus backward compatibility.
     $this->options($this->options);
   }
 
-  function _set_option_defaults(&$storage, $options, $level = 0) {
+  public function _set_option_defaults(&$storage, $options, $level = 0) {
     foreach ($options as $option => $definition) {
       if (isset($definition['contains']) && is_array($definition['contains'])) {
         $storage[$option] = array();
@@ -76,7 +77,7 @@
    * Unpack options over our existing defaults, drilling down into arrays
    * so that defaults don't get totally blown away.
    */
-  function unpack_options(&$storage, $options, $definition = NULL, $all = TRUE) {
+  public function unpack_options(&$storage, $options, $definition = NULL, $all = TRUE) {
     if (!is_array($options)) {
       return;
     }
@@ -117,14 +118,14 @@
   /**
    * Let the handler know what its full definition is.
    */
-  function set_definition($definition) {
+  public function set_definition($definition) {
     $this->definition = $definition;
     if (isset($definition['field'])) {
       $this->real_field = $definition['field'];
     }
   }
 
-  function destroy() {
+  public function destroy() {
     if (isset($this->view)) {
       unset($this->view);
     }
@@ -138,7 +139,7 @@
     }
   }
 
-  function export_options($indent, $prefix) {
+  public function export_options($indent, $prefix) {
     $output = '';
     foreach ($this->option_definition() as $option => $definition) {
       $output .= $this->export_option($indent, $prefix, $this->options, $option, $definition, array());
@@ -147,7 +148,7 @@
     return $output;
   }
 
-  function export_option($indent, $prefix, $storage, $option, $definition, $parents) {
+  public function export_option($indent, $prefix, $storage, $option, $definition, $parents) {
     // Do not export options for which we have no settings.
     if (!isset($storage[$option])) {
       return;
Index: includes/query.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/query.inc,v
retrieving revision 1.50
diff -u -r1.50 query.inc
--- includes/query.inc	5 Oct 2009 22:49:03 -0000	1.50
+++ includes/query.inc	6 Feb 2010 18:23:33 -0000
@@ -13,62 +13,62 @@
   /**
    * A list of tables in the order they should be added, keyed by alias.
    */
-  var $table_queue = array();
+  public $table_queue = array();
 
   /**
    * Holds an array of tables and counts added so that we can create aliases
    */
-  var $tables = array();
+  public $tables = array();
 
   /**
    * Holds an array of relationships, which are aliases of the primary
    * table that represent different ways to join the same table in.
    */
-  var $relationships = array();
+  public $relationships = array();
 
   /**
    * An array of sections of the WHERE query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
    */
-  var $where = array();
+  public $where = array();
   /**
    * An array of sections of the HAVING query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
    */
-  var $having = array();
+  public $having = array();
   /**
    * The default operator to use when connecting the WHERE groups. May be
    * AND or OR.
    */
-  var $group_operator = 'AND';
+  public $group_operator = 'AND';
 
   /**
    * A simple array of order by clauses.
    */
-  var $orderby = array();
+  public $orderby = array();
 
   /**
    * A simple array of group by clauses.
    */
-  var $groupby = array();
+  public $groupby = array();
 
   /**
    * The table header to use for tablesort. This matters because tablesort
    * needs to modify the query and needs the header.
    */
-  var $header = array();
+  public $header = array();
 
   /**
    * A flag as to whether or not to make the primary field distinct.
    */
-  var $distinct = FALSE;
+  public $distinct = FALSE;
 
   /**
    * Constructor; Create the basic query object and fill with default values.
    */
-  function views_query($base_table = 'node', $base_field = 'nid') {
+  public function views_query($base_table = 'node', $base_field = 'nid') {
     $this->base_table = $base_table;  // Predefine these above, for clarity.
     $this->base_field = $base_field;
     $this->relationships[$base_table] = array(
@@ -114,7 +114,7 @@
   /**
    * Set the base field to be distinct.
    */
-  function set_distinct($value = TRUE) {
+  public function set_distinct($value = TRUE) {
     if (!(isset($this->no_distinct) && $value)) {
       // Hack in a check to see if node_access is going to add its own DISTINCT
       // and break this query.
@@ -135,7 +135,7 @@
   /**
    * Set what field the query will count() on for paging.
    */
-  function set_count_field($table, $field, $alias = NULL) {
+  public function set_count_field($table, $field, $alias = NULL) {
     if (empty($alias)) {
       $alias = $table . '_' . $field;
     }
@@ -151,7 +151,7 @@
    * Set the table header; used for click-sorting because it's needed
    * info to modify the ORDER BY clause.
    */
-  function set_header($header) {
+  public function set_header($header) {
     $this->header = $header;
   }
 
@@ -186,7 +186,7 @@
    *   might have a relationship to an 'album' node, which might
    *   have a relationship to an 'artist' node.
    */
-  function add_relationship($alias, $join, $base, $link_point = NULL) {
+  public function add_relationship($alias, $join, $base, $link_point = NULL) {
     if (empty($link_point)) {
       $link_point = $this->base_table;
     }
@@ -254,7 +254,7 @@
    *   adding parts to the query. Or FALSE if the table was not able to be
    *   added.
    */
-  function add_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
+  public function add_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
     if (!$this->ensure_path($table, $relationship, $join)) {
       return FALSE;
     }
@@ -295,7 +295,7 @@
    *   adding parts to the query. Or FALSE if the table was not able to be
    *   added.
    */
-  function queue_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
+  public function queue_table($table, $relationship = NULL, $join = NULL, $alias = NULL) {
     // If the alias is set, make sure it doesn't already exist.
     if (isset($this->table_queue[$alias])) {
       return $alias;
@@ -358,7 +358,7 @@
     return $alias;
   }
 
-  function mark_table($table, $relationship, $alias) {
+  public function mark_table($table, $relationship, $alias) {
     // Mark that this table has been added.
     if (empty($this->tables[$relationship][$table])) {
       if (!isset($alias)) {
@@ -400,7 +400,7 @@
    *   The alias used to refer to this specific table, or NULL if the table
    *   cannot be ensured.
    */
-  function ensure_table($table, $relationship = NULL, $join = NULL) {
+  public function ensure_table($table, $relationship = NULL, $join = NULL) {
     // ensure a relationship
     if (empty($relationship)) {
       $relationship = $this->base_table;
@@ -479,7 +479,7 @@
    * query they will be added, but additional copies will NOT be added
    * if the table is already there.
    */
-  function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) {
+  public function ensure_path($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) {
     if (!isset($relationship)) {
       $relationship = $this->base_table;
     }
@@ -531,7 +531,7 @@
    * Fix a join to adhere to the proper relationship; the left table can vary
    * based upon what relationship items are joined in on.
    */
-  function adjust_join($join, $relationship) {
+  public function adjust_join($join, $relationship) {
     if (!empty($join->adjusted)) {
       return $join;
     }
@@ -584,7 +584,7 @@
    * @return
    *   A views_join object or child object, if one exists.
    */
-  function get_join_data($table, $base_table) {
+  public function get_join_data($table, $base_table) {
     // Check to see if we're linking to a known alias. If so, get the real
     // table's data instead.
     if (!empty($this->table_queue[$table])) {
@@ -600,7 +600,7 @@
    * If you need the alias of a table with a particular relationship, use
    * ensure_table().
    */
-  function get_table_info($table) {
+  public function get_table_info($table) {
     if (!empty($this->table_queue[$table])) {
       return $this->table_queue[$table];
     }
@@ -633,7 +633,7 @@
    * @return $name
    *   The name that this field can be referred to as. Usually this is the alias.
    */
-  function add_field($table, $field, $alias = '', $params = NULL) {
+  public function add_field($table, $field, $alias = '', $params = NULL) {
     // We check for this specifically because it gets a special alias.
     if ($table == $this->base_table && $field == $this->base_field && empty($alias)) {
       $alias = $this->base_field;
@@ -669,7 +669,7 @@
    * Remove all fields that may've been added; primarily used for summary
    * mode where we're changing the query because we didn't get data we needed.
    */
-  function clear_fields() {
+  public function clear_fields() {
     $this->fields = array();
   }
 
@@ -687,7 +687,7 @@
    * @return $group
    *   The group ID generated.
    */
-  function set_where_group($type = 'AND', $group = NULL, $where = 'where') {
+  public function set_where_group($type = 'AND', $group = NULL, $where = 'where') {
     // Set an alias.
     $groups = &$this->$where;
 
@@ -710,7 +710,7 @@
    * @param $type
    *   Either 'AND' or 'OR'
    */
-  function set_group_operator($type = 'AND') {
+  public function set_group_operator($type = 'AND') {
     $this->group_operator = strtoupper($type);
   }
 
@@ -732,7 +732,7 @@
    *   A number of arguments as used in db_query(). May be many args or one
    *   array full of args.
    */
-  function add_where($group, $clause) {
+  public function add_where($group, $clause) {
     $args = func_get_args();
     array_shift($args); // ditch $group
     array_shift($args); // ditch $clause
@@ -780,7 +780,7 @@
    *   A number of arguments as used in db_query(). May be many args or one
    *   array full of args.
    */
-  function add_having($group, $clause) {
+  public function add_having($group, $clause) {
     $args = func_get_args();
     array_shift($args); // ditch $group
     array_shift($args); // ditch $clause
@@ -824,7 +824,7 @@
    *   one will be generated for from the $field; however, if the
    *   $field is a formula, this alias will likely fail.
    */
-  function add_orderby($table, $field, $order, $alias = '') {
+  public function add_orderby($table, $field, $order, $alias = '') {
     if ($table) {
       $this->ensure_table($table);
     }
@@ -857,7 +857,7 @@
    * for ensuring that the fields are fully qualified and the table is properly
    * added.
    */
-  function add_groupby($clause) {
+  public function add_groupby($clause) {
     // Only add it if it's not already in there.
     if (!in_array($clause, $this->groupby)) {
       $this->groupby[] = $clause;
@@ -870,7 +870,7 @@
    * @param $where
    *   'where' or 'having'.
    */
-  function condition_sql($where = 'where') {
+  public function condition_sql($where = 'where') {
     $clauses = array();
     foreach ($this->$where as $group => $info) {
       $clause = implode(") " . $info['type'] . " (", $info['clauses']);
@@ -899,7 +899,7 @@
    * @param $get_count
    *   Provide a countquery if this is true, otherwise provide a normal query.
    */
-  function query($get_count = FALSE) {
+  public function query($get_count = FALSE) {
     // Check query distinct value.
     if (empty($this->no_distinct) && $this->distinct && !empty($this->fields)) {
       if (!empty($this->fields[$this->base_field])) {
@@ -1006,7 +1006,7 @@
   /**
    * Get the arguments attached to the WHERE and HAVING clauses of this query.
    */
-  function get_where_args() {
+  public function get_where_args() {
     $args = array();
     foreach ($this->where as $group => $where) {
       $args = array_merge($args, $where['args']);
Index: modules/profile/views_handler_field_profile_date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/profile/views_handler_field_profile_date.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_profile_date.inc
--- modules/profile/views_handler_field_profile_date.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/profile/views_handler_field_profile_date.inc	6 Feb 2010 18:23:34 -0000
@@ -7,7 +7,7 @@
  * SQL. About all we can do is unserialize and display them.
  */
 class views_handler_field_profile_date extends views_handler_field_date {
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     // we can't do "time ago" so remove it from the form.
     unset($form['date_format']['#options']['time ago']);
@@ -16,7 +16,7 @@
   /**
    * Display a profile field of type 'date'
    */
-  function render($value) {
+  public function render($value) {
     if (!$value->{$this->field_alias}) {
       return;
     }
Index: modules/profile/views_handler_filter_profile_selection.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/profile/views_handler_filter_profile_selection.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_profile_selection.inc
--- modules/profile/views_handler_filter_profile_selection.inc	3 Sep 2008 19:21:29 -0000	1.1
+++ modules/profile/views_handler_filter_profile_selection.inc	6 Feb 2010 18:23:34 -0000
@@ -5,7 +5,7 @@
  * Filter by a selection widget in the profile.
  */
 class views_handler_filter_profile_selection extends views_handler_filter_in_operator {
-  function get_value_options() {
+  public function get_value_options() {
     if (isset($this->value_options)) {
       return;
     }
Index: modules/profile/views_handler_field_profile_list.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/profile/views_handler_field_profile_list.inc,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 views_handler_field_profile_list.inc
--- modules/profile/views_handler_field_profile_list.inc	2 Nov 2009 22:01:26 -0000	1.4.4.1
+++ modules/profile/views_handler_field_profile_list.inc	6 Feb 2010 18:23:34 -0000
@@ -7,7 +7,7 @@
   /**
    * Break up our field into a proper list.
    */
-  function pre_render($values) {
+  public function pre_render($values) {
     $field = $value->{$this->field_alias};
     $this->items[$field] = array();
     foreach (split("[\n\r]", $field) as $item) {
@@ -17,15 +17,15 @@
     }
   }
 
-  function render_item($count, $item) {
+  public function render_item($count, $item) {
     return $item['item'];
   }
 
-  function document_self_tokens(&$tokens) {
+  public function document_self_tokens(&$tokens) {
     $tokens['[' . $this->options['id'] . '-item' . ']'] = t('The text of the profile item.');
   }
 
-  function add_self_tokens(&$tokens, $item) {
+  public function add_self_tokens(&$tokens, $item) {
     $tokens['[' . $this->options['id'] . '-item' . ']'] = $item['item'];
   }
 }
Index: modules/upload/views_handler_field_upload_fid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/upload/views_handler_field_upload_fid.inc,v
retrieving revision 1.10.4.2
diff -u -r1.10.4.2 views_handler_field_upload_fid.inc
--- modules/upload/views_handler_field_upload_fid.inc	13 Nov 2009 12:39:22 -0000	1.10.4.2
+++ modules/upload/views_handler_field_upload_fid.inc	6 Feb 2010 18:23:34 -0000
@@ -4,18 +4,18 @@
  * Field handler to provide a list of roles.
  */
 class views_handler_field_upload_fid extends views_handler_field_prerender_list {
-  function construct() {
+  public function construct() {
     parent::construct();
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_file'] = array('default' => FALSE);
     $options['only_listed'] = array('default' => FALSE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_file'] = array(
       '#title' => t('Link this field to download the file'),
@@ -30,7 +30,7 @@
     );
   }
 
-  function pre_render($values) {
+  public function pre_render($values) {
     $vids = array();
     $this->items = array();
 
@@ -60,11 +60,11 @@
     }
   }
 
-  function render_item($count, $item) {
+  public function render_item($count, $item) {
     return $item['description'];
   }
 
-  function document_self_tokens(&$tokens) {
+  public function document_self_tokens(&$tokens) {
     $tokens['[' . $this->options['id'] . '-fid' . ']'] = t('The file ID for the file.');
     $tokens['[' . $this->options['id'] . '-name' . ']'] = t('The name of the attached file.');
     $tokens['[' . $this->options['id'] . '-type' . ']'] = t('The MIME type of the attached file.');
@@ -74,7 +74,7 @@
     $tokens['[' . $this->options['id'] . '-size' . ']'] = t('The size of the attached file.');
   }
 
-  function add_self_tokens(&$tokens, $item) {
+  public function add_self_tokens(&$tokens, $item) {
     $tokens['[' . $this->options['id'] . '-fid' . ']'] = $item['fid'];
     $tokens['[' . $this->options['id'] . '-name' . ']'] = $item['filename'];
     $tokens['[' . $this->options['id'] . '-type' . ']'] = $item['filemime'];
Index: modules/upload/views_handler_filter_upload_fid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/upload/views_handler_filter_upload_fid.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_filter_upload_fid.inc
--- modules/upload/views_handler_filter_upload_fid.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/upload/views_handler_filter_upload_fid.inc	6 Feb 2010 18:23:34 -0000
@@ -5,12 +5,12 @@
  * Filter by whether or not a node has attached files from the upload module
  */
 class views_handler_filter_upload_fid extends views_handler_filter_boolean_operator {
-  function construct() {
+  public function construct() {
     parent::construct();
     $this->value_value = t('Has attached files');
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->query->add_where($this->options['group'], "(SELECT COUNT(*) FROM {upload} u WHERE u.vid = $this->table_alias.$this->real_field) " . (empty($this->value) ? '=' : '<>') . " 0");
   }
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.1
diff -u -r1.5.4.1 views_handler_field_upload_description.inc
--- modules/upload/views_handler_field_upload_description.inc	2 Nov 2009 22:01:26 -0000	1.5.4.1
+++ modules/upload/views_handler_field_upload_description.inc	6 Feb 2010 18:23:34 -0000
@@ -5,20 +5,20 @@
  * Field handler to provide a list of roles.
  */
 class views_handler_field_upload_description extends views_handler_field {
-  function init(&$view, &$options) {
+  public function init(&$view, &$options) {
     parent::init($view, $options);
     if (!empty($options['link_to_file'])) {
       $this->additional_fields['fid'] = 'fid';
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_file'] = array('default' => FALSE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_to_file'] = array(
       '#title' => t('Link this field to download the file'),
@@ -27,7 +27,7 @@
     );
   }
 
-  function pre_render($values) {
+  public function pre_render($values) {
     if (empty($this->options['link_to_file'])) {
       return;
     }
@@ -50,7 +50,7 @@
     }
   }
 
-  function render($values) {
+  public function render($values) {
     return $this->render_link($values->{$this->field_alias}, $values);
   }
 
@@ -59,7 +59,7 @@
    *
    * Data should be made XSS safe prior to calling this function.
    */
-  function render_link($data, $value) {
+  public function render_link($data, $value) {
     if (!empty($this->options['link_to_file']) && $value->{$this->aliases['fid']} && $data !== NULL && $data !== '') {
       $values = $this->items[$value->{$this->aliases['fid']}];
       $this->options['alter']['make_link'] = TRUE;
Index: tests/views_query.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/tests/Attic/views_query.test,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 views_query.test
--- tests/views_query.test	28 Nov 2009 16:29:17 -0000	1.1.2.2
+++ tests/views_query.test	6 Feb 2010 18:23:35 -0000
@@ -519,7 +519,7 @@
   /**
    * Tests time based caching.
    */
-  function testTimeCaching() {
+  public function testTimeCaching() {
     // Create a basic result which just 2 results.
     $view = $this->getBasicView();
     $view->set_display();
@@ -561,7 +561,7 @@
   /**
    * Tests no caching.
    */
-  function testNoneCaching() {
+  public function testNoneCaching() {
     // Create a basic result which just 2 results.
     $view = $this->getBasicView();
     $view->set_display();
Index: tests/views_groupby.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/tests/Attic/views_groupby.test,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 views_groupby.test
--- tests/views_groupby.test	26 Jan 2010 15:53:02 -0000	1.1.4.2
+++ tests/views_groupby.test	6 Feb 2010 18:23:35 -0000
@@ -108,7 +108,7 @@
    * @param $group_by
    *   Which group_by function should be used, for example sum or count.
    */
-  function GroupByTestHelper($group_by, $values) {
+  public function GroupByTestHelper($group_by, $values) {
     // Create 2 nodes of type1 and 3 nodes of type2
     $type1 = $this->drupalCreateContentType();
     $type2 = $this->drupalCreateContentType();
@@ -142,7 +142,7 @@
     $this->assertEqual($results[$type2->type], $values[1]);
   }
 
-  function viewsGroupByViewHelper($group_by) {
+  public function viewsGroupByViewHelper($group_by) {
     $view = new view;
     $view->name = 'group_by_count';
     $view->description = '';
@@ -199,24 +199,24 @@
     $this->GroupByTestHelper('count', array(4, 3));
   }
 
-  function testGroupBySum() {
+  public function testGroupBySum() {
     $this->GroupByTestHelper('sum', array(10, 18));
   }
 
 
-  function testGroupByAverage() {
+  public function testGroupByAverage() {
     $this->GroupByTestHelper('avg', array(2.5, 6));
   }
 
-  function testGroupByMin() {
+  public function testGroupByMin() {
     $this->GroupByTestHelper('min', array(1, 5));
   }
 
-  function testGroupByMax() {
+  public function testGroupByMax() {
     $this->GroupByTestHelper('max', array(4, 7));
   }
 
-  function testGroupBySave() {
+  public function testGroupBySave() {
     $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
     $this->drupalLogin($admin_user);
     views_invalidate_cache();
@@ -257,7 +257,7 @@
     $this->assertTrue(strpos($view->build_info['query'], 'HAVING'), t('Make sure that HAVING is in the query'));
   }
 
-  function viewsGroupByCountViewOnlyFilters() {
+  public function viewsGroupByCountViewOnlyFilters() {
     $view = new view;
     $view->name = 'group_by_in_filters';
     $view->description = '';
Index: tests/views_pager.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/tests/Attic/views_pager.test,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 views_pager.test
--- tests/views_pager.test	6 Feb 2010 13:29:48 -0000	1.1.2.2
+++ tests/views_pager.test	6 Feb 2010 18:23:35 -0000
@@ -263,7 +263,7 @@
     // TODO test number of pages.
   }
 
-  function ViewsPagerFull() {
+  public function ViewsPagerFull() {
     $view = new view;
     $view->name = 'test_pager_full';
     $view->description = '';
Index: modules/filter/views_handler_field_filter_format_name.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/filter/views_handler_field_filter_format_name.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_field_filter_format_name.inc
--- modules/filter/views_handler_field_filter_format_name.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/filter/views_handler_field_filter_format_name.inc	6 Feb 2010 18:23:33 -0000
@@ -4,18 +4,18 @@
  * Field handler to output the name of an input format.
  */
 class views_handler_field_filter_format_name extends views_handler_field {
-  function construct() {
+  public function construct() {
     parent::construct();
     // Be explicit about the table we are using.
     $this->additional_fields['name'] = array('table' => 'filter_formats', 'field' => 'name');
   }
 
-  function query() {
+  public function query() {
     $this->ensure_my_table();
     $this->add_additional_fields();
   }
 
-  function render($values) {
+  public function render($values) {
     $format_name = $values->{$this->aliases['name']};
     if (!$format_name) {
       // Default or invalid input format.
Index: modules/contact/views_handler_field_contact_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/contact/views_handler_field_contact_link.inc,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 views_handler_field_contact_link.inc
--- modules/contact/views_handler_field_contact_link.inc	2 Nov 2009 22:01:26 -0000	1.2.4.1
+++ modules/contact/views_handler_field_contact_link.inc	6 Feb 2010 18:23:33 -0000
@@ -5,13 +5,13 @@
  */
 class views_handler_field_contact_link extends views_handler_field_user_link {
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
     $options['link_display'] = array('default' => 'link', 'translatable' => FALSE);
     return $options;
   }
 
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['link_display'] = array(
       '#title' => t('Type of link'),
@@ -27,7 +27,7 @@
     $form['text']['#default_value'] = empty($this->options['text']) ? t('contact') : $this->options['text'];
   }
 
-  function render($values) {
+  public function render($values) {
     global $user;
     $uid = $values->{$this->aliases['uid']};
 
Index: modules/statistics/views_handler_field_accesslog_path.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/statistics/views_handler_field_accesslog_path.inc,v
retrieving revision 1.1
diff -u -r1.1 views_handler_field_accesslog_path.inc
--- modules/statistics/views_handler_field_accesslog_path.inc	3 Sep 2008 19:21:30 -0000	1.1
+++ modules/statistics/views_handler_field_accesslog_path.inc	6 Feb 2010 18:23:34 -0000
@@ -7,14 +7,14 @@
   /**
    * Override init function to provide generic option to link to node.
    */
-  function init(&$view, &$data) {
+  public function init(&$view, &$data) {
     parent::init($view, $data);
     if (isset($data['display_as_link'])) {
       $this->additional_fields[] = 'path';
     }
   }
 
-  function option_definition() {
+  public function option_definition() {
     $options = parent::option_definition();
 
     $options['display_as_link'] = array('default' => TRUE);
@@ -25,7 +25,7 @@
   /**
    * Provide link to the page being visited.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     $form['display_as_link'] = array(
       '#title' => t('Display as link'),
@@ -34,7 +34,7 @@
     );
   }
 
-  function render($values) {
+  public function render($values) {
     $title = check_plain($values->{$this->field_alias});
     if (!empty($this->options['display_as_link'])) {
       return l($title, $values->{$this->aliases['path']}, array('html' => TRUE));
