Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove override handler handling

8.0.x
Bram Goffings 2012-08-13 09:42:17 +02:00 committed by Tim Plunkett
parent af74bd089a
commit 93351462df
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Drupal/views/Tests/ModuleTest.php
View File

@ -147,10 +147,6 @@ class ModuleTest extends ViewsSqlTest {
$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));
}
/**

4
views.module
View File

@ -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.