Skip to content
Snippets Groups Projects
Commit ae84c08e authored by Angie Byron's avatar Angie Byron
Browse files

#334238 follow-up by Dave Reid: Fixed detection of core modules and themes in update.module.

parent 598e7392
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
...@@ -180,12 +180,7 @@ function update_get_project_name($file) { ...@@ -180,12 +180,7 @@ function update_get_project_name($file) {
if (isset($file->info['project'])) { if (isset($file->info['project'])) {
$project_name = $file->info['project']; $project_name = $file->info['project'];
} }
elseif (isset($file->info['package']) && (strpos($file->info['package'], 'Core') !== FALSE)) { elseif (isset($file->info['package']) && (strpos($file->info['package'], 'Core') === 0)) {
$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.
$project_name = 'drupal'; $project_name = 'drupal';
} }
return $project_name; return $project_name;
......
; $Id$ ; $Id$
name = Garland name = Garland
description = Tableless, recolorable, multi-column, fluid width theme. description = Tableless, recolorable, multi-column, fluid width theme.
package = Core
version = VERSION version = VERSION
core = 7.x core = 7.x
engine = phptemplate engine = phptemplate
......
; $Id$ ; $Id$
name = Minnelli name = Minnelli
description = Tableless, recolorable, multi-column, fixed width theme. description = Tableless, recolorable, multi-column, fixed width theme.
package = Core
version = VERSION version = VERSION
core = 7.x core = 7.x
base theme = garland base theme = garland
......
; $Id$ ; $Id$
name = Seven name = Seven
description = A simple one-column, tableless, fluid width administration theme. description = A simple one-column, tableless, fluid width administration theme.
core = 7.x package = Core
version = VERSION version = VERSION
core = 7.x
engine = phptemplate engine = phptemplate
stylesheets[screen][] = reset.css stylesheets[screen][] = reset.css
stylesheets[screen][] = style.css stylesheets[screen][] = style.css
......
; $Id$ ; $Id$
name = Stark 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>. 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 version = VERSION
core = 7.x core = 7.x
engine = phptemplate engine = phptemplate
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment