diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index e9710c2..58c85b5 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -295,24 +295,25 @@ function color_scheme_form_submit($form, &$form_state) {
$palette += $info['schemes']['default']['colors'];
}
- // Make sure enough memory is available.
- // Fetch source image dimensions.
- $source = drupal_get_path('theme', $theme) . '/' . $info['base_image'];
- list($width, $height) = getimagesize($source);
-
- // We need at least a copy of the source and a target buffer of the same
- // size (both at 32bpp).
- $required = $width * $height * 8;
- // We intend to prevent color scheme changes if there isn't enough memory
- // available. memory_get_usage(TRUE) returns a more accurate number than
- // memory_get_usage(), therefore we won't inadvertently reject a color
- // scheme change based on a faulty memory calculation.
- $usage = memory_get_usage(TRUE);
- $memory_limit = ini_get('memory_limit');
- $size = parse_size($memory_limit);
- if (!drupal_check_memory_limit($usage + $required, $memory_limit)) {
- drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $size), '@url' => 'http://www.php.net/manual/ini.core.php#ini.sect.resource-limits')), 'error');
- return;
+ // Make sure enough memory is available, if PHP's memory limit is compiled in.
+ if (isset($info['base_image']) && function_exists('memory_get_usage')) {
+ // Fetch source image dimensions.
+ $source = drupal_get_path('theme', $theme) . '/' . $info['base_image'];
+ list($width, $height) = getimagesize($source);
+
+ // We need at least a copy of the source and a target buffer of the same
+ // size (both at 32bpp).
+ $required = $width * $height * 8;
+ // We intend to prevent color scheme changes if there isn't enough memory
+ // available. memory_get_usage(TRUE) returns a more accurate number than
+ // memory_get_usage(), therefore we won't inadvertently reject a color
+ // scheme change based on a faulty memory calculation.
+ $usage = memory_get_usage(TRUE);
+ $limit = parse_size(ini_get('memory_limit'));
+ if ($usage + $required > $limit) {
+ drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $limit), '@url' => 'http://www.php.net/manual/ini.core.php#ini.sect.resource-limits')), 'error');
+ return;
+ }
}
// Delete old files.
@@ -360,7 +361,7 @@ function color_scheme_form_submit($form, &$form_state) {
}
// Render new images, if image has been provided.
- if ($info['base_image']) {
+ if (isset($info['base_image'])) {
_color_render_images($theme, $info, $paths, $palette);
}
diff --git a/core/themes/bartik/color/base.png b/core/themes/bartik/color/base.png
deleted file mode 100644
index 58cc088..0000000
--- a/core/themes/bartik/color/base.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-
IHDR € œ Õˆˆ© PLTEÿÿÿ§ÄÈ "IDATx^íÀ ‚ þ¯nˆ°0 €1\ ä’Ï IEND®B`‚
\ No newline at end of file
diff --git a/core/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc
index f70450c..f46e0c0 100644
--- a/core/themes/bartik/color/color.inc
+++ b/core/themes/bartik/color/color.inc
@@ -124,14 +124,11 @@
// with their filename as used in the stylesheet.
'slices' => array(),
- // Reference color used for blending. Matches the base.png's colors.
+ // Reference color used for blending.
'blend_target' => '#ffffff',
// Preview files.
'preview_css' => 'color/preview.css',
'preview_js' => 'color/preview.js',
'preview_html' => 'color/preview.html',
-
- // Base file for image generation.
- 'base_image' => 'color/base.png',
);
diff --git a/core/themes/bartik/color/preview.png b/core/themes/bartik/color/preview.png
deleted file mode 100644
index 58cc088..0000000
--- a/core/themes/bartik/color/preview.png
+++ /dev/null
@@ -1,3 +0,0 @@
-‰PNG
-
-
IHDR € œ Õˆˆ© PLTEÿÿÿ§ÄÈ "IDATx^íÀ ‚ þ¯nˆ°0 €1\ ä’Ï IEND®B`‚
\ No newline at end of file