diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-06-29 00:48:14 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-06-29 00:48:14 +0000 |
| commit | cbfdd2e9c7bc67f374ecb434369111d630399fea (patch) | |
| tree | 1056b48403a31ea41e30337bdba98e9bebeb5b73 | |
| parent | d18daf82a7c349288b700bec91073c7494fe8cc3 (diff) | |
| download | brdo-cbfdd2e9c7bc67f374ecb434369111d630399fea.tar.gz brdo-cbfdd2e9c7bc67f374ecb434369111d630399fea.tar.bz2 | |
- Patch #839178 by Damien Tournoud, dereine: filter settings silliness.
| -rw-r--r-- | modules/filter/filter.module | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 3ee343c67..6fb1f3cad 100644 --- 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; } |