- Patch #839178 by Damien Tournoud, dereine: filter settings silliness.

2010-06-29 00:48:14 +00:00 · 2010-06-29 00:48:14 +00:00 · cbfdd2e9c7
parent d18daf82a7
commit cbfdd2e9c7
1 changed files with 4 additions and 0 deletions
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@ -638,6 +638,10 @@ function filter_list_format($format_id) {
        $filter->title = $filter_info[$name]['title'];
        // Unpack stored filter settings.
        $filter->settings = (isset($filter->settings) ? unserialize($filter->settings) : array());
+        // Merge in default settings.
+        if (isset($filter_info[$name]['default settings'])) {
+          $filter->settings += $filter_info[$name]['default settings'];
+        }

        $format_filters[$name] = $filter;
      }