From 5501be94ab521d2b046796f7fe9d42b25c9cdeca Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 29 May 2013 14:21:16 +0100
Subject: [PATCH] Issue #2002418 by Psikik: Rename Views method can_group() to
 canGroup().

---
 .../lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php   | 2 +-
 .../lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php     | 2 +-
 .../views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index c906877dc7..90b7efa004 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -1429,7 +1429,7 @@ public function query() {
    *
    * @return bool
    */
-   function can_group() {
+   public function canGroup() {
      return TRUE;
    }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
index 1f6a914471..1454bc038f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
@@ -59,6 +59,6 @@ public function adminLabel($short = FALSE) {
     return $this->getField(parent::adminLabel($short));
   }
 
-  function can_group() { return FALSE; }
+  public function canGroup() { return FALSE; }
 
 }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php
index ff5db0ab20..e49cc9633d 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php
@@ -142,7 +142,7 @@ public function buildForm(array $form, array &$form_state) {
       }
 
       $handler = $display->getHandler($type, $id);
-      if ($grouping && $handler && !$handler->can_group()) {
+      if ($grouping && $handler && !$handler->canGroup()) {
         $field['group'] = 'ungroupable';
       }
 
-- 
GitLab