Commit cbfdd2e9 authored by Dries's avatar Dries

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

parent d18daf82
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment