From 0dd7a7d243a6953508ab27e9341ce3a1215d2e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= Date: Sun, 13 Mar 2011 17:47:43 +0200 Subject: [PATCH] Issue #1010958: Added code to allow merging in presets, default preset and the styles. --- styles.module | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/styles.module b/styles.module index 4dd5598..cf26d27 100644 --- a/styles.module +++ b/styles.module @@ -312,11 +312,16 @@ function styles_default_presets($return_type = NULL, $reset = FALSE) { $styles[$field_type]['containers'] = isset($styles[$field_type]['containers']) ? $styles[$field_type]['containers'] : array(); $styles[$field_type]['containers'] = array_merge($containers, $styles[$field_type]['containers']); foreach ($container['containers'] as $style_name => $style) { + $prev_styles = isset($containers[$style_name]['styles']) ? $containers[$style_name]['styles'] : array(); + $prev_presets = isset($containers[$style_name]['presets']) ? $containers[$style_name]['presets'] : array(); + $default_preset = isset($containers[$style_name]['default preset']) ? $containers[$style_name]['default preset'] : (isset($style['default preset']) ? $style['default preset'] : ''); $style['name'] = $style_name; $style['module'] = $module; $style['storage'] = STYLES_STORAGE_DEFAULT; $style['styles'] = isset($style['styles']) ? $style['styles'] : array(); - $default_preset = isset($style['default preset']) ? $style['default preset'] : ''; + $style['styles'] = array_merge($prev_styles, $style['styles']); + $style['presets'] = isset($style['presets']) ? $style['presets'] : array(); + $style['presets'] = array_merge($prev_presets, $style['presets']); foreach ($all_styles['styles'] as $container_style_name => $container_style) { if (!isset($style['styles'][$container_style_name])) { $style['styles'][$container_style_name] = array( -- 1.7.1