commit 3eb31d0e207252248552ed574a7adec7b84b5fed Author: Ivan Boothe Date: Fri May 24 16:10:55 2013 -0700 2002426-new-changes diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php index 06be116..c3f0c0d 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php @@ -223,7 +223,7 @@ function add_field_table($use_groupby) { /** * Determine if this field is click sortable. */ - function clickSortable() { + public function clickSortable() { // Not click sortable in any case. if (empty($this->definition['click sortable'])) { return FALSE; diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Plugin/views/field/TranslationLink.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Plugin/views/field/TranslationLink.php index 9c67bfe..2050e5e 100644 --- a/core/modules/translation_entity/lib/Drupal/translation_entity/Plugin/views/field/TranslationLink.php +++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Plugin/views/field/TranslationLink.php @@ -78,7 +78,7 @@ public function query() { } /** - * Overrides \Drupal\views\Plugin\views\Plugin\field\FieldPluginBase::click_sortable(). + * Overrides \Drupal\views\Plugin\views\Plugin\field\FieldPluginBase::clickSortable(). */ public function clickSortable() { return FALSE; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index cba08d0..5bc3015 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -181,7 +181,7 @@ function click_sort($order) { * The value of 'click sortable' from the plugin definition, this defaults * to TRUE if not set. */ - function clickSortable() { + public function clickSortable() { return isset($this->definition['click sortable']) ? $this->definition['click sortable'] : TRUE; } diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php index 484d593..cc48ae9 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php @@ -524,7 +524,7 @@ function testIsValueEmpty() { * Tests whether the filters are click sortable as expected. */ public function testClickSortable() { - // Test that click_sortable is TRUE by default. + // Test that clickSortable is TRUE by default. $item = array( 'table' => 'views_test_data', 'field' => 'name', @@ -532,12 +532,12 @@ public function testClickSortable() { $plugin = views_get_handler($item, 'field'); $this->assertTrue($plugin->clickSortable(), 'TRUE as a default value is correct.'); - // Test that click_sortable is TRUE by when set TRUE in the data. + // Test that clickSortable is TRUE by when set TRUE in the data. $item['field'] = 'id'; $plugin = views_get_handler($item, 'field'); $this->assertTrue($plugin->clickSortable(), 'TRUE as a views data value is correct.'); - // Test that click_sortable is FALSE by when set FALSE in the data. + // Test that clickSortable is FALSE by when set FALSE in the data. $item['field'] = 'job'; $plugin = views_get_handler($item, 'field'); $this->assertFalse($plugin->clickSortable(), 'FALSE as a views data value is correct.');