Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.433 diff -u -9 -p -r1.433 bootstrap.inc --- includes/bootstrap.inc 25 Oct 2010 00:06:19 -0000 1.433 +++ includes/bootstrap.inc 25 Oct 2010 21:06:42 -0000 @@ -660,35 +660,32 @@ function drupal_settings_initialize() { function drupal_get_filename($type, $name, $filename = NULL) { // The location of files will not change during the request, so do not use // drupal_static(). static $files = array(); if (!isset($files[$type])) { $files[$type] = array(); } - if (!empty($filename) && file_exists($filename)) { + if (!empty($filename)) { $files[$type][$name] = $filename; } elseif (isset($files[$type][$name])) { // nothing } // Verify that we have an active database connection, before querying // the database. This is required because this function is called both // before we have a database connection (i.e. during installation) and // when a database connection fails. else { try { if (function_exists('db_query')) { - $file = db_query("SELECT filename FROM {system} WHERE name = :name AND type = :type", array(':name' => $name, ':type' => $type))->fetchField(); - if (file_exists(DRUPAL_ROOT . '/' . $file)) { - $files[$type][$name] = $file; - } + $files[$type][$name] = db_query("SELECT filename FROM {system} WHERE name = :name AND type = :type", array(':name' => $name, ':type' => $type))->fetchField(); } } catch (Exception $e) { // The database table may not exist because Drupal is not yet installed, // or the database might be down. We have a fallback for this case so we // hide the error completely. } // Fallback to searching the filesystem if the database could not find the // file or the file returned by the database is not found. Index: includes/update.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/update.inc,v retrieving revision 1.79 diff -u -9 -p -r1.79 update.inc --- includes/update.inc 25 Oct 2010 00:06:19 -0000 1.79 +++ includes/update.inc 25 Oct 2010 21:06:43 -0000 @@ -730,18 +730,23 @@ function update_fix_d7_requirements() { * path based on their schema version in the system table. * * The install profile will be set to schema_version 0, as it has already been * installed. Any other hook_update_N functions provided by the install profile * will be run by update.php. */ function update_fix_d7_install_profile() { $profile = drupal_get_profile(); + // 'Default' profile has been renamed to 'Standard', see system_update_7049(). + if ($profile == 'default') { + $profile = 'standard'; + } + $results = db_select('system', 's') ->fields('s', array('name', 'schema_version')) ->condition('name', $profile) ->condition('type', 'module') ->execute() ->fetchAll(); if (empty($results)) { $filename = 'profiles/' . $profile . '/' . $profile . '.profile';