Merge pull request #1742 from forkcms/1737-datagrid-button-casing

Make sure the column name check is case insensitive
forkcms · Sep 20, 2016 · 3675d7c · 3675d7c
2 parents 7834f7d + 0dd8269
commit 3675d7c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Backend/Core/Engine/DataGrid.php b/src/Backend/Core/Engine/DataGrid.php
@@ -113,11 +113,14 @@ public function addColumn(
         $image = null,
         $sequence = null
     ) {
+        // make sure we use a lowercased column in all checks
+        $lowercasedName = mb_strtolower($name);
+
         $icon = $this->decideIcon($name);
 
         // known actions that should have a button
         if (in_array(
-            $name,
+            $lowercasedName,
             array('add', 'edit', 'delete', 'detail', 'details', 'approve', 'mark_as_spam', 'install')
         )
         ) {
@@ -132,7 +135,7 @@ public function addColumn(
             $URL = null;
         }
 
-        if (in_array($name, array('use_revision', 'use_draft'))) {
+        if (in_array($lowercasedName, array('use_revision', 'use_draft'))) {
             // rebuild value, it should have special markup
             $value =
                 '<a href="' . $URL . '" class="btn btn-default btn-xs">' .
@@ -149,7 +152,7 @@ public function addColumn(
 
         // known actions
         if (in_array(
-            $name,
+            $lowercasedName,
             array(
                 'add',
                 'edit',
@@ -620,12 +623,12 @@ public function setURL($URL, $append = false)
      */
     private function decideIcon($name)
     {
-        $icon = null;
+        $name = mb_strtolower($name);
 
-        if (isset($this->mapIcons[$name])) {
-            $icon = $this->mapIcons[$name];
+        if (!isset($this->mapIcons[$name])) {
+            return null;
         }
 
-        return $icon;
+        return $this->mapIcons[$name];
     }
 }