diff --git a/core/lib/Drupal/Core/Template/TwigEnvironment.php b/core/lib/Drupal/Core/Template/TwigEnvironment.php index 86f5dc6..4989eec 100644 --- a/core/lib/Drupal/Core/Template/TwigEnvironment.php +++ b/core/lib/Drupal/Core/Template/TwigEnvironment.php @@ -80,7 +80,6 @@ public function loadTemplate($name, $index = NULL) { if (!class_exists($cls, FALSE)) { $cache_filename = $this->getCacheFilename($name); - if ($cache_filename === FALSE) { $source = $this->loader->getSource($name); $compiled_source = $this->compileSource($source, $name); @@ -103,7 +102,6 @@ public function loadTemplate($name, $index = NULL) { if (!$this->runtimeInitialized) { $this->initRuntime(); } - return $this->loadedTemplates[$cls] = new $cls($this); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php index 1f3a672..6154bf7 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php @@ -65,7 +65,7 @@ function operators() { 'title' => t('Is one of'), 'short' => t('or'), 'short_single' => t('='), - 'method' => 'op_helper', + 'method' => 'addFilter', 'values' => 1, 'ensure_my_table' => 'helper', ), @@ -73,7 +73,7 @@ function operators() { 'title' => t('Is all of'), 'short' => t('and'), 'short_single' => t('='), - 'method' => 'op_helper', + 'method' => 'addFilter', 'values' => 1, 'ensure_my_table' => 'helper', ), @@ -81,7 +81,7 @@ function operators() { 'title' => t('Is none of'), 'short' => t('not'), 'short_single' => t('<>'), - 'method' => 'op_helper', + 'method' => 'addFilter', 'values' => 1, 'ensure_my_table' => 'helper', ), @@ -130,7 +130,7 @@ public function ensureMyTable() { return parent::ensureMyTable(); } - function op_helper() { + function addFilter() { if (empty($this->value)) { return; }