From ae84c08eaa48c209d98b7a9e1e7bd8467171ccf9 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 29 Sep 2009 16:30:30 +0000
Subject: [PATCH] #334238 follow-up by Dave Reid: Fixed detection of core
modules and themes in update.module.
---
modules/update/update.compare.inc | 7 +------
themes/garland/garland.info | 1 +
themes/garland/minnelli/minnelli.info | 1 +
themes/seven/seven.info | 3 ++-
themes/stark/stark.info | 2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc
index 764c42cba0ee..996855aa746b 100644
--- a/modules/update/update.compare.inc
+++ b/modules/update/update.compare.inc
@@ -180,12 +180,7 @@ function update_get_project_name($file) {
if (isset($file->info['project'])) {
$project_name = $file->info['project'];
}
- elseif (isset($file->info['package']) && (strpos($file->info['package'], 'Core') !== FALSE)) {
- $project_name = 'drupal';
- }
- elseif (in_array($file->name, array('garland', 'minnelli', 'stark'))) {
- // Unfortunately, there's no way to tell if a theme is part of core,
- // so we must hard-code a list here.
+ elseif (isset($file->info['package']) && (strpos($file->info['package'], 'Core') === 0)) {
$project_name = 'drupal';
}
return $project_name;
diff --git a/themes/garland/garland.info b/themes/garland/garland.info
index 96089d6dd7fc..4c9597771343 100644
--- a/themes/garland/garland.info
+++ b/themes/garland/garland.info
@@ -1,6 +1,7 @@
; $Id$
name = Garland
description = Tableless, recolorable, multi-column, fluid width theme.
+package = Core
version = VERSION
core = 7.x
engine = phptemplate
diff --git a/themes/garland/minnelli/minnelli.info b/themes/garland/minnelli/minnelli.info
index f10c04dac034..e5c88fe72fb0 100644
--- a/themes/garland/minnelli/minnelli.info
+++ b/themes/garland/minnelli/minnelli.info
@@ -1,6 +1,7 @@
; $Id$
name = Minnelli
description = Tableless, recolorable, multi-column, fixed width theme.
+package = Core
version = VERSION
core = 7.x
base theme = garland
diff --git a/themes/seven/seven.info b/themes/seven/seven.info
index 6b3e9458a05f..cce1a5e78f5e 100644
--- a/themes/seven/seven.info
+++ b/themes/seven/seven.info
@@ -1,8 +1,9 @@
; $Id$
name = Seven
description = A simple one-column, tableless, fluid width administration theme.
-core = 7.x
+package = Core
version = VERSION
+core = 7.x
engine = phptemplate
stylesheets[screen][] = reset.css
stylesheets[screen][] = style.css
diff --git a/themes/stark/stark.info b/themes/stark/stark.info
index cf2df92ee79d..c3955fd4f65e 100644
--- a/themes/stark/stark.info
+++ b/themes/stark/stark.info
@@ -1,7 +1,7 @@
; $Id$
-
name = Stark
description = This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, you should start reading the <a href="http://drupal.org/theme-guide">Theming Guide</a>.
+package = Core
version = VERSION
core = 7.x
engine = phptemplate
--
GitLab