Commit 93351462 authored by aspilicious's avatar aspilicious Committed by tim.plunkett
Browse files

remove override handler handling

parent af74bd08
...@@ -147,10 +147,6 @@ function testviews_get_handler() { ...@@ -147,10 +147,6 @@ function testviews_get_handler() {
$this->assertInstanceHandler($handler, 'views_test', 'name', 'field'); $this->assertInstanceHandler($handler, 'views_test', 'name', 'field');
$handler = views_get_handler('views_test_previous', 'name_previous', 'argument'); $handler = views_get_handler('views_test_previous', 'name_previous', 'argument');
$this->assertInstanceHandler($handler, 'views_test', 'name', '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));
} }
/** /**
......
...@@ -1224,7 +1224,7 @@ function views_include_handlers($reset = FALSE) { ...@@ -1224,7 +1224,7 @@ function views_include_handlers($reset = FALSE) {
* @return views_handler * @return views_handler
* An instance of a handler object. May be views_handler_broken. * 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(); static $recursion_protection = array();
$data = views_fetch_data($table, FALSE); $data = views_fetch_data($table, FALSE);
...@@ -1255,7 +1255,7 @@ function views_get_handler($table, $field, $key, $override = NULL) { ...@@ -1255,7 +1255,7 @@ function views_get_handler($table, $field, $key, $override = NULL) {
} }
$recursion_protection[$moved_table][$moved_field] = TRUE; $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(); $recursion_protection = array();
if ($handler) { if ($handler) {
// store these values so we know what we were originally called. // store these values so we know what we were originally called.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment