diff --git a/features.export.inc b/features.export.inc index d35317e..9c76aea 100644 --- a/features.export.inc +++ b/features.export.inc @@ -213,11 +213,15 @@ function features_export_prepare($export, $module_name, $reset = FALSE, $add_dep // Order info array. $standard_info = array(); - foreach (array_merge(array('name', 'description', 'core', 'package', 'php', 'version', 'project', 'dependencies'), $copy_list) as $item) { + foreach (array_merge(array('name', 'description', 'core', 'package', 'version', 'project', 'dependencies'), $copy_list) as $item) { if (isset($export[$item])) { $standard_info[$item] = $export[$item]; } } + if (isset($export['php']) && ($export['php'] != DRUPAL_MINIMUM_PHP)) { + $standard_info['php'] = $export['php']; + } + unset($export['php']); $export = features_array_diff_assoc_recursive($export, $standard_info); ksort($export); diff --git a/features.module b/features.module index 59952b3..ae49710 100644 --- a/features.module +++ b/features.module @@ -570,6 +570,10 @@ function features_install_modules($modules) { // Build maximal list of dependencies. $install = array(); foreach ($modules as $name) { + // Avoid false-reported feature overrides for php = 5.2.4 line in .info file. + if (isset($row->info['php'])) { + unset($row->info['php']); + } // Parse the dependency string into the module name and version information. $parsed_name = drupal_parse_dependency($name); $name = $parsed_name['name'];