Merge remote-tracking branch 'magento-l3/ACP2E-102' into L3_PR_21-10-19

Author: veloraven

app/code/Magento/Backend/Block/Widget/Grid.php

@@ -300,13 +300,17 @@ protected function _addColumnFilterToCollection($column)
         if ($this->getCollection()) {
             $field = $column->getFilterIndex() ? $column->getFilterIndex() : $column->getIndex();
             if ($column->getFilterConditionCallback()) {
-                $column->getFilterConditionCallback()[0]->{$column->getFilterConditionCallback()[1]}(
+                $object = isset($column->getFilterConditionCallback()['object'])
+                    ? $column->getFilterConditionCallback()['object'] : $column->getFilterConditionCallback()[0];
+                $method = isset($column->getFilterConditionCallback()['method'])
+                    ? $column->getFilterConditionCallback()['method'] : $column->getFilterConditionCallback()[1];
+                $object->$method(
                     $this->getCollection(),
                     $column
                 );
             } else {
                 $condition = $column->getFilter()->getCondition();
-                if ($field && isset($condition)) {
+                if ($field && $condition) {
                     $this->getCollection()->addFieldToFilter($field, $condition);
                 }
             }