Merge pull request #3010 from nicoden/patch/columnDefaults

Fix loading of defaults columns options in table-filter-control

src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -446,7 +446,7 @@
         valuesFilterControl: []
     });
 
-    $.extend($.fn.bootstrapTable.COLUMN_DEFAULTS, {
+    $.extend($.fn.bootstrapTable.columnDefaults, {
         filterControl: undefined,
         filterData: undefined,
         filterDatepickerOptions: undefined,