Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / views / src / Plugin / views / argument / NumericArgument.php

diff --git a/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php b/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php
index 954171a64af0e278704fcf987764ddf505dcc16a..f6da02f66c1b06b8d477057baa1c73a9e135b0ce 100644 (file)
--- a/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php
+++ b/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php
@@ -105,16 +105,16 @@ class NumericArgument extends ArgumentPluginBase {
     }
 
     $placeholder = $this->placeholder();
-    $null_check = empty($this->options['not']) ? '' : "OR $this->tableAlias.$this->realField IS NULL";
+    $null_check = empty($this->options['not']) ? '' : " OR $this->tableAlias.$this->realField IS NULL";
 
     if (count($this->value) > 1) {
       $operator = empty($this->options['not']) ? 'IN' : 'NOT IN';
       $placeholder .= '[]';
-      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator($placeholder) $null_check", [$placeholder => $this->value]);
+      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator($placeholder)" . $null_check, [$placeholder => $this->value]);
     }
     else {
       $operator = empty($this->options['not']) ? '=' : '!=';
-      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator $placeholder $null_check", [$placeholder => $this->argument]);
+      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator $placeholder" . $null_check, [$placeholder => $this->argument]);
     }
   }