Commit 8ad624ec authored by Brandon Post's avatar Brandon Post Committed by Damien McKenna
Browse files

Issue #2977851 by brandonpost, DamienMcKenna, ethomas08: Follow up: PHP 7.2:... 

Issue #2977851 by brandonpost, DamienMcKenna, ethomas08: Follow up: PHP 7.2: count() on non-Countable in views_many_to_one_helper.
parent cb785229

includes/handlers.inc

+9 −2
Original line number Diff line number Diff line
@@ -1077,12 +1077,19 @@ class views_many_to_one_helper { 
    // should be added via an db_or()/db_and() (TRUE).

    $add_condition = TRUE;

    if ($operator == 'or' && empty($options['reduce_duplicates'])) {

      if (is_array($value)) {

      if (is_array($value) && count($value) > 1) {

        $operator = 'IN';

      }

      else {

        $value = is_array($value) ? array_pop($value) : $value;

        if (is_array($value) && count($value) > 1) {

          $operator = 'IN';

        }

	else {

          $value = is_array($value) ? array_pop($value) : $value;

          $operator = '=';

        }

      }

      $add_condition = FALSE;

    }

modules/taxonomy/views_handler_argument_term_node_tid_depth.inc

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument 
        return FALSE;

      }



      if (count($tids->value) > 1) {

      if (is_array($tids->value) && count($tids->value) > 1) {

        $operator = 'IN';

      }

      else {

modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ class views_handler_argument_term_node_tid_depth_join extends views_handler_argu 
        return FALSE;

      }



      if (count($tids->value) > 1) {

      if (is_array($tids->value) && count($tids->value) > 1) {

        $operator = 'IN';

      }

      else {