diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-17 02:12:44 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-17 02:12:44 +0000 |
| commit | 7d4a02a3d9f93d47ef6379a75490145a89ab41d8 (patch) | |
| tree | 392e1a3be49eaddfc54257aa91b5c44406668986 /modules/system/system.install | |
| parent | 4e28fbfd3997cb6785213b857f36c5914fa5c906 (diff) | |
| download | brdo-7d4a02a3d9f93d47ef6379a75490145a89ab41d8.tar.gz brdo-7d4a02a3d9f93d47ef6379a75490145a89ab41d8.tar.bz2 | |
#829378 by David_Rothstein: Fixed Update system should use the API to identify the install profile, rather than preg_match().
Diffstat (limited to 'modules/system/system.install')
| -rw-r--r-- | modules/system/system.install | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 68dd8182b..ea5f62ab2 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -372,10 +372,11 @@ function system_requirements($phase) { // Display an error if a newly introduced dependency in a module is not resolved. if ($phase == 'update') { + $profile = drupal_get_profile(); $files = system_rebuild_module_data(); foreach ($files as $module => $file) { // Ignore disabled modules and install profiles. - if (!$file->status || preg_match('/\.profile$/', $file->filename)) { + if (!$file->status || $module == $profile) { continue; } // Check the module's PHP version. |