summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefan.r2016-10-03 09:51:53 (GMT)
committerstefan.r2016-10-03 09:51:53 (GMT)
commit00e9ceb1585bb55bb1e57d1d9214f52f9caeb69b (patch)
tree98891765bcdf68f732261c2dbb39d726c7db1b07
parent64a69f81f2565da57c843d705199e315df50b437 (diff)
Issue #2762241 by David_Rothstein, wylbur: Missing default.profile from the file system
-rw-r--r--includes/bootstrap.inc4
-rw-r--r--modules/system/system.install15
2 files changed, 17 insertions, 2 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 2cc8931..86ee6ce 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1072,8 +1072,8 @@ function _drupal_get_filename_perform_file_scan($type, $name) {
*/
function _drupal_get_filename_fallback_trigger_error($type, $name, $error_type) {
// Hide messages due to known bugs that will appear on a lot of sites.
- // @todo Remove this in https://www.drupal.org/node/2762241
- if (empty($name) || ($type == 'module' && $name == 'default')) {
+ // @todo Remove this in https://www.drupal.org/node/2383823
+ if (empty($name)) {
return;
}
diff --git a/modules/system/system.install b/modules/system/system.install
index fa794eb..ae55b89 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3271,6 +3271,21 @@ function system_update_7080() {
}
/**
+ * Remove the Drupal 6 default install profile if it is still in the database.
+ */
+function system_update_7081() {
+ // Sites which used the default install profile in Drupal 6 and then updated
+ // to Drupal 7.44 or earlier will still have a record of this install profile
+ // in the database that needs to be deleted.
+ db_delete('system')
+ ->condition('filename', 'profiles/default/default.profile')
+ ->condition('type', 'module')
+ ->condition('status', 0)
+ ->condition('schema_version', 0)
+ ->execute();
+}
+
+/**
* @} End of "defgroup updates-7.x-extra".
* The next series of updates should start at 8000.
*/