From 93351462dfff5d0d3a56c9f4ca8204ade98bc5e1 Mon Sep 17 00:00:00 2001 From: Bram Goffings <bramgoffings@gmail.com> Date: Mon, 13 Aug 2012 09:42:17 +0200 Subject: [PATCH] remove override handler handling --- lib/Drupal/views/Tests/ModuleTest.php | 4 ---- views.module | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Drupal/views/Tests/ModuleTest.php b/lib/Drupal/views/Tests/ModuleTest.php index 10d0165e647b..22d8a69a08dd 100644 --- a/lib/Drupal/views/Tests/ModuleTest.php +++ b/lib/Drupal/views/Tests/ModuleTest.php @@ -147,10 +147,6 @@ function testviews_get_handler() { $this->assertInstanceHandler($handler, 'views_test', 'name', 'field'); $handler = views_get_handler('views_test_previous', 'name_previous', 'argument'); $this->assertInstanceHandler($handler, 'views_test', 'name', 'argument'); - - // Test the override handler feature. - $handler = views_get_handler('views_test', 'job', 'filter', 'views_handler_filter'); - $this->assertEqual('views_handler_filter', get_class($handler)); } /** diff --git a/views.module b/views.module index 762b3b2503cd..508578e0eb56 100644 --- a/views.module +++ b/views.module @@ -1224,7 +1224,7 @@ function views_include_handlers($reset = FALSE) { * @return views_handler * An instance of a handler object. May be views_handler_broken. */ -function views_get_handler($table, $field, $key, $override = NULL) { +function views_get_handler($table, $field, $key) { static $recursion_protection = array(); $data = views_fetch_data($table, FALSE); @@ -1255,7 +1255,7 @@ function views_get_handler($table, $field, $key, $override = NULL) { } $recursion_protection[$moved_table][$moved_field] = TRUE; - $handler = views_get_handler($moved_table, $moved_field, $key, $override); + $handler = views_get_handler($moved_table, $moved_field, $key); $recursion_protection = array(); if ($handler) { // store these values so we know what we were originally called. -- GitLab