Index: plugins/views_plugin_style_summary.inc
===================================================================
--- plugins/views_plugin_style_summary.inc	(revision 6281)
+++ plugins/views_plugin_style_summary.inc	(working copy)
@@ -21,7 +21,7 @@
     return $options;
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     if (!empty($this->options['override'])) {
       $this->view->set_items_per_page(intval($this->options['items_per_page']));
     }
Index: plugins/views_plugin_style_summary_jump_menu.inc
===================================================================
--- plugins/views_plugin_style_summary_jump_menu.inc	(revision 6281)
+++ plugins/views_plugin_style_summary_jump_menu.inc	(working copy)
@@ -23,7 +23,7 @@
     return $options;
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     // Copy the offset option.
     $pager = array(
       'type' => 'none',
Index: plugins/views_plugin_pager.inc
===================================================================
--- plugins/views_plugin_pager.inc	(revision 6281)
+++ plugins/views_plugin_pager.inc	(working copy)
@@ -160,7 +160,7 @@
    *
    * This is called during the build phase and can directly modify the query.
    */
-  function query() { }
+  function query($get_count = FALSE) { }
 
   /**
    * Perform any needed actions just prior to the query executing.
Index: plugins/views_plugin_query.inc
===================================================================
--- plugins/views_plugin_query.inc	(revision 6281)
+++ plugins/views_plugin_query.inc	(working copy)
@@ -72,7 +72,7 @@
 
   function options_validate(&$form, &$form_state) { }
 
-  function options_submit(&$form, &$form_state) { }
+  function options_submit($form, &$form_state) { }
 
   function summary_title() {
     return t('Settings');
Index: plugins/views_plugin_pager_none.inc
===================================================================
--- plugins/views_plugin_pager_none.inc	(revision 6281)
+++ plugins/views_plugin_pager_none.inc	(working copy)
@@ -52,7 +52,7 @@
     $this->total_items = count($result);
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     // 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_pager_full.inc
===================================================================
--- plugins/views_plugin_pager_full.inc	(revision 6281)
+++ plugins/views_plugin_pager_full.inc	(working copy)
@@ -169,7 +169,7 @@
     }
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     if ($this->items_per_page_exposed()) {
       if (!empty($_GET['items_per_page']) && $_GET['items_per_page'] > 0) {
         $this->options['items_per_page'] = $_GET['items_per_page'];
Index: plugins/views_plugin_pager_some.inc
===================================================================
--- plugins/views_plugin_pager_some.inc	(revision 6281)
+++ plugins/views_plugin_pager_some.inc	(working copy)
@@ -48,7 +48,7 @@
     return FALSE;
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     $this->view->query->set_limit($this->options['items_per_page']);
     $this->view->query->set_offset($this->options['offset']);
   }
Index: plugins/views_plugin_access_role.inc
===================================================================
--- plugins/views_plugin_access_role.inc	(revision 6676)
+++ plugins/views_plugin_access_role.inc	(working copy)
@@ -51,7 +51,7 @@
     }
   }
 
-  function options_submit(&$form, &$form_state) {
+  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_exposed_form.inc
===================================================================
--- plugins/views_plugin_exposed_form.inc	(revision 6676)
+++ plugins/views_plugin_exposed_form.inc	(working copy)
@@ -135,7 +135,7 @@
     }
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     $view = $this->view;
     $exposed_data = $view->exposed_data;
     if (!empty($exposed_data['sort_by'])) {
Index: plugins/views_plugin_style.inc
===================================================================
--- plugins/views_plugin_style.inc	(revision 6676)
+++ plugins/views_plugin_style.inc	(working copy)
@@ -349,7 +349,7 @@
     return $errors;
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     parent::query();
     if (isset($this->row_plugin)) {
       $this->row_plugin->query();
Index: plugins/views_plugin_display.inc
===================================================================
--- plugins/views_plugin_display.inc	(revision 6676)
+++ plugins/views_plugin_display.inc	(working copy)
@@ -2147,7 +2147,7 @@
   /**
    * Inject anything into the query that the display handler needs.
    */
-  function query() {  }
+  function query($get_count = FALSE) {  }
 
   /**
    * Not all display plugins will support filtering
Index: plugins/views_plugin_row.inc
===================================================================
--- plugins/views_plugin_row.inc	(revision 6281)
+++ plugins/views_plugin_row.inc	(working copy)
@@ -98,7 +98,7 @@
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) { }
+  function options_validate(&$form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form values prior to storage.
@@ -106,7 +106,7 @@
    */
   function options_submit($form, &$form_state) { }
 
-  function query() {
+  function query($get_count = FALSE) {
     if (isset($this->base_table)) {
       if (isset($this->options['relationship']) && isset($this->view->relationship[$this->options['relationship']])) {
         $relationship = $this->view->relationship[$this->options['relationship']];
Index: plugins/views_plugin_exposed_form_input_required.inc
===================================================================
--- plugins/views_plugin_exposed_form_input_required.inc	(revision 6676)
+++ plugins/views_plugin_exposed_form_input_required.inc	(working copy)
@@ -79,7 +79,7 @@
     }
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     if (!$this->exposed_filter_applied()) {
       // We return with no query; this will force the empty text.
       $this->view->built = TRUE;
Index: handlers/views_handler_argument_numeric.inc
===================================================================
--- handlers/views_handler_argument_numeric.inc	(revision 6281)
+++ handlers/views_handler_argument_numeric.inc	(working copy)
@@ -70,7 +70,7 @@
     return $this->value;
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
 
     if (!empty($this->options['break_phrase'])) {
Index: handlers/views_handler_area.inc
===================================================================
--- handlers/views_handler_area.inc	(revision 6676)
+++ handlers/views_handler_area.inc	(working copy)
@@ -64,7 +64,7 @@
   /**
    * Don't run a query
    */
-  function query() { }
+  function query($get_count = FALSE) { }
 
   /**
    * Render the area
@@ -83,7 +83,7 @@
   }
 
   function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
+  function query($get_count = FALSE) { /* No query to run */ }
   function render($empty = FALSE) { return ''; }
   function options_form(&$form, &$form_state) {
     $form['markup'] = array(
Index: handlers/views_handler_sort_formula.inc
===================================================================
--- handlers/views_handler_sort_formula.inc	(revision 6281)
+++ handlers/views_handler_sort_formula.inc	(working copy)
@@ -27,7 +27,7 @@
   /**
    * Called to add the sort to a query.
    */
-  function query() {
+  function query($get_count = FALSE) {
     if (is_array($this->formula)) {
       global $db_type;
       if (isset($this->formula[$db_type])) {
Index: handlers/views_handler_area_text.inc
===================================================================
--- handlers/views_handler_area_text.inc	(revision 6676)
+++ handlers/views_handler_area_text.inc	(working copy)
@@ -80,7 +80,7 @@
     }
   }
 
-  function options_submit(&$form, &$form_state) {
+  function options_submit($form, &$form_state) {
     $form_state['values']['options']['format'] = $form_state['values']['format'];
     parent::options_submit($form, $form_state);
   }
Index: handlers/views_handler_field_counter.inc
===================================================================
--- handlers/views_handler_field_counter.inc	(revision 6281)
+++ handlers/views_handler_field_counter.inc	(working copy)
@@ -20,7 +20,7 @@
     );
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     // do nothing -- to override the parent query.
   }
 
Index: handlers/views_handler_field.inc
===================================================================
--- handlers/views_handler_field.inc	(revision 6676)
+++ handlers/views_handler_field.inc	(working copy)
@@ -58,7 +58,7 @@
   /**
    * Called to add the field to a query.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     // Add the field.
     $this->field_alias = $this->query->add_field($this->table_alias, $this->real_field);
@@ -1130,7 +1130,7 @@
   }
 
   function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
+  function query($get_count = FALSE) { /* No query to run */ }
   function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#prefix' => '<div class="form-item description">',
Index: handlers/views_handler_sort_date.inc
===================================================================
--- handlers/views_handler_sort_date.inc	(revision 6281)
+++ handlers/views_handler_sort_date.inc	(working copy)
@@ -39,7 +39,7 @@
   /**
    * Called to add the sort to a query.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     switch ($this->options['granularity']) {
       case 'second':
Index: handlers/views_handler_filter.inc
===================================================================
--- handlers/views_handler_filter.inc	(revision 6676)
+++ handlers/views_handler_filter.inc	(working copy)
@@ -557,7 +557,7 @@
    * level of indirection. You will find them in $this->operator
    * and $this->value respectively.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     $this->query->add_where($this->options['group'], "$this->table_alias.$this->real_field " . $this->operator . " '%s'", $this->value);
   }
@@ -585,7 +585,7 @@
   }
 
   function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
+  function query($get_count = FALSE) { /* No query to run */ }
   function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#prefix' => '<div class="form-item description">',
Index: handlers/views_handler_sort.inc
===================================================================
--- handlers/views_handler_sort.inc	(revision 6281)
+++ handlers/views_handler_sort.inc	(working copy)
@@ -18,7 +18,7 @@
   /**
    * Called to add the sort to a query.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     // Add the field.
     $this->query->add_orderby($this->table_alias, $this->real_field, $this->options['order']);
@@ -87,7 +87,7 @@
   /**
    * Simple submit handler
    */
-  function options_submit(&$form, &$form_state) {
+  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'])) {
@@ -173,7 +173,7 @@
   }
 
   function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
+  function query($get_count = FALSE) { /* No query to run */ }
   function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#prefix' => '<div class="form-item description">',
Index: handlers/views_handler_sort_random.inc
===================================================================
--- handlers/views_handler_sort_random.inc	(revision 6281)
+++ handlers/views_handler_sort_random.inc	(working copy)
@@ -4,7 +4,7 @@
  * Handle a random sort.
  */
 class views_handler_sort_random extends views_handler_sort {
-  function query() {
+  function query($get_count = FALSE) {
     global $db_type;
     switch ($db_type) {
       case 'mysql':
Index: handlers/views_handler_filter_boolean_operator.inc
===================================================================
--- handlers/views_handler_filter_boolean_operator.inc	(revision 6281)
+++ handlers/views_handler_filter_boolean_operator.inc	(working copy)
@@ -135,7 +135,7 @@
     $this->options['expose']['optional'] = FALSE;
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
 
     $where = "$this->table_alias.$this->real_field ";
Index: handlers/views_handler_relationship.inc
===================================================================
--- handlers/views_handler_relationship.inc	(revision 6281)
+++ handlers/views_handler_relationship.inc	(working copy)
@@ -91,7 +91,7 @@
   /**
    * Called to implement a relationship in a query.
    */
-  function query() {
+  function query($get_count = FALSE) {
     // 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'];
@@ -134,7 +134,7 @@
   }
 
   function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
+  function query($get_count = FALSE) { /* No query to run */ }
   function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#prefix' => '<div class="form-item description">',
Index: handlers/views_handler_argument_formula.inc
===================================================================
--- handlers/views_handler_argument_formula.inc	(revision 6281)
+++ handlers/views_handler_argument_formula.inc	(working copy)
@@ -44,7 +44,7 @@
   /**
    * Build the query based upon the formula
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     // Now that our table is secure, get our formula.
     $formula = $this->get_formula();
Index: handlers/views_handler_filter_numeric.inc
===================================================================
--- handlers/views_handler_filter_numeric.inc	(revision 6676)
+++ handlers/views_handler_filter_numeric.inc	(working copy)
@@ -253,7 +253,7 @@
     }
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     $field = "$this->table_alias.$this->real_field";
 
Index: handlers/views_handler_argument_string.inc
===================================================================
--- handlers/views_handler_argument_string.inc	(revision 6676)
+++ handlers/views_handler_argument_string.inc	(working copy)
@@ -172,7 +172,7 @@
   /**
    * Build the query based upon the formula
    */
-  function query() {
+  function query($get_count = FALSE) {
     $argument = $this->argument;
     if (!empty($this->options['transform_dash'])) {
       $argument = strtr($argument, '-', ' ');
Index: handlers/views_handler_argument_many_to_one.inc
===================================================================
--- handlers/views_handler_argument_many_to_one.inc	(revision 6281)
+++ handlers/views_handler_argument_many_to_one.inc	(working copy)
@@ -73,7 +73,7 @@
     $this->helper->ensure_my_table();
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     $empty = FALSE;
     if (isset($this->definition['zero is null']) && $this->definition['zero is null']) {
       if (empty($this->argument)) {
Index: handlers/views_handler_sort_menu_hierarchy.inc
===================================================================
--- handlers/views_handler_sort_menu_hierarchy.inc	(revision 6281)
+++ handlers/views_handler_sort_menu_hierarchy.inc	(working copy)
@@ -9,7 +9,7 @@
  * @ingroup views_sort_handlers
  */
 class views_handler_sort_menu_hierarchy extends views_handler_sort {
-  function query() {
+  function query($get_count = FALSE) {
     $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_field_group_by_numeric.inc
===================================================================
--- handlers/views_handler_field_group_by_numeric.inc	(revision 6676)
+++ handlers/views_handler_field_group_by_numeric.inc	(working copy)
@@ -15,7 +15,7 @@
   /**
    * Called to add the field to a query.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     // Add the field, taking care of any aggregation that may affect it.
     $params = array(
Index: handlers/views_handler_filter_string.inc
===================================================================
--- handlers/views_handler_filter_string.inc	(revision 6281)
+++ handlers/views_handler_filter_string.inc	(working copy)
@@ -228,7 +228,7 @@
    * level of indirection. You will find them in $this->operator
    * and $this->value respectively.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     $field = "$this->table_alias.$this->real_field";
     $upper = $this->case_transform();
Index: handlers/views_handler_argument_null.inc
===================================================================
--- handlers/views_handler_argument_null.inc	(revision 6281)
+++ handlers/views_handler_argument_null.inc	(working copy)
@@ -55,5 +55,5 @@
    * Override the behavior of query() to prevent the query
    * from being changed in any way.
    */
-  function query() {}
+  function query($get_count = FALSE) {}
 }
Index: handlers/views_handler_field_custom.inc
===================================================================
--- handlers/views_handler_field_custom.inc	(revision 6281)
+++ handlers/views_handler_field_custom.inc	(working copy)
@@ -6,7 +6,7 @@
  * @ingroup views_field_handlers
  */
 class views_handler_field_custom extends views_handler_field {
-  function query() {
+  function query($get_count = FALSE) {
     // do nothing -- to override the parent query.
   }
 
Index: handlers/views_handler_filter_group_by_numeric.inc
===================================================================
--- handlers/views_handler_filter_group_by_numeric.inc	(revision 6676)
+++ handlers/views_handler_filter_group_by_numeric.inc	(working copy)
@@ -4,7 +4,7 @@
  * Simple filter to handle greater than/less than filters
  */
 class views_handler_filter_group_by_numeric extends views_handler_filter_numeric {
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     $field = $this->get_field();
 
Index: handlers/views_handler_sort_group_by_numeric.inc
===================================================================
--- handlers/views_handler_sort_group_by_numeric.inc	(revision 6676)
+++ handlers/views_handler_sort_group_by_numeric.inc	(working copy)
@@ -14,7 +14,7 @@
   /**
    * Called to add the field to a query.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
 
     $params = array(
Index: handlers/views_handler_argument.inc
===================================================================
--- handlers/views_handler_argument.inc	(revision 6676)
+++ handlers/views_handler_argument.inc	(working copy)
@@ -680,7 +680,7 @@
    *
    * The argument sent may be found at $this->argument.
    */
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     $placeholder = empty($this->definition['numeric']) ? "'%s'" : '%d';
     $this->query->add_where(0, "$this->table_alias.$this->real_field = $placeholder", $this->argument);
@@ -927,7 +927,7 @@
   }
 
   function ensure_my_table() { /* No table to ensure! */ }
-  function query() { /* No query to run */ }
+  function query($get_count = FALSE) { /* No query to run */ }
   function options_form(&$form, &$form_state) {
     $form['markup'] = array(
       '#prefix' => '<div class="form-item description">',
Index: handlers/views_handler_filter_boolean_operator_string.inc
===================================================================
--- handlers/views_handler_filter_boolean_operator_string.inc	(revision 6281)
+++ handlers/views_handler_filter_boolean_operator_string.inc	(working copy)
@@ -9,7 +9,7 @@
  * - label: (REQUIRED) The label for the checkbox.
  */
 class views_handler_filter_boolean_operator_string extends views_handler_filter_boolean_operator {
-  function query() {
+  function query($get_count = FALSE) {
     $this->ensure_my_table();
     $where = "$this->table_alias.$this->real_field ";
 
Index: handlers/views_handler_filter_in_operator.inc
===================================================================
--- handlers/views_handler_filter_in_operator.inc	(revision 6281)
+++ handlers/views_handler_filter_in_operator.inc	(working copy)
@@ -333,7 +333,7 @@
     return $operator . (($values !== '') ? ' ' . $values : '');
   }
 
-  function query() {
+  function query($get_count = FALSE) {
     $info = $this->operators();
     if (!empty($info[$this->operator]['method'])) {
       $this->{$info[$this->operator]['method']}();
Index: handlers/views_handler_field_math.inc
===================================================================
--- handlers/views_handler_field_math.inc	(revision 6281)
+++ handlers/views_handler_field_math.inc	(working copy)
@@ -69,5 +69,5 @@
     return $this->sanitize_value($this->options['prefix'] . $value . $this->options['suffix']);
   }
 
-  function query() { }
+  function query($get_count = FALSE) { }
 }
Index: includes/handlers.inc
===================================================================
--- includes/handlers.inc	(revision 6676)
+++ includes/handlers.inc	(working copy)
@@ -411,7 +411,7 @@
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) { }
+  function options_validate(&$form, &$form_state) { }
 
   function options_form(&$form, &$form_state) {
     $form['ui_name'] = array(
Index: includes/plugins.inc
===================================================================
--- includes/plugins.inc	(revision 6281)
+++ includes/plugins.inc	(working copy)
@@ -479,7 +479,7 @@
   /**
    * Add anything to the query that we might need to.
    */
-  function query() { }
+  function query($get_count = FALSE) { }
 
   /**
    * Provide a full list of possible theme templates used by this style.