Verified Commit 83118cc0 authored by Dave Long's avatar Dave Long
Browse files

Issue #3557123 by alexpott, smustgrave: PHP 8.5 deprecations triggered by...

Issue #3557123 by alexpott, smustgrave: PHP 8.5 deprecations triggered by \Drupal\views\Plugin\views\query\Sql

(cherry picked from commit d99619db)
parent 88aa6a2c
Loading
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ public function addTable($table, $relationship = NULL, ?JoinPluginBase $join = N
   */
  public function queueTable($table, $relationship = NULL, ?JoinPluginBase $join = NULL, $alias = NULL) {
    // If the alias is set, make sure it doesn't already exist.
    if (isset($this->tableQueue[$alias])) {
    if (isset($alias, $this->tableQueue[$alias])) {
      return $alias;
    }

@@ -539,7 +539,7 @@ public function queueTable($table, $relationship = NULL, ?JoinPluginBase $join =

    // Check this again to make sure we don't blow up existing aliases for
    // already adjusted joins.
    if (isset($this->tableQueue[$alias])) {
    if (isset($alias, $this->tableQueue[$alias])) {
      return $alias;
    }

@@ -912,8 +912,10 @@ public function addField($table, $field, $alias = '', $params = []) {
      $this->fields[$alias] = $field_info;
    }

    if ($table) {
      // Keep track of all aliases used.
      $this->fieldAliases[$table][$field] = $alias;
    }

    return $alias;
  }