Merge "Upgrade to Drupal Core 7.50"

This commit is contained in:
Jenkins 2016-07-22 18:31:38 +00:00 committed by Gerrit Code Review
commit ee445788b1
2 changed files with 18 additions and 2 deletions

View File

@ -3,9 +3,9 @@ core = 7.x
; Download Drupal core and apply core patches if needed.
projects[drupal][type] = "core"
projects[drupal][version] = "7.44"
projects[drupal][version] = "7.50"
projects[drupal][download][type] = get
projects[drupal][download][url] = http://ftp.drupal.org/files/projects/drupal-7.44.tar.gz
projects[drupal][download][url] = http://ftp.drupal.org/files/projects/drupal-7.50.tar.gz
; This patch allows install profile to list requirements on the install page
; http://drupal.org/node/1971072
@ -30,3 +30,7 @@ projects[drupal][patch][] = https://drupal.org/files/issues/node_access_grants-s
; File_get_file_references is slow and buggy
; https://drupal.org/node/1805690#comment-8734045
projects[drupal][patch][] = https://drupal.org/files/issues/1805690_11.patch
; Fix an installation profile issue caused by release 7.50 and
; https://www.drupal.org/files/issues/I1971072.patch
projects[drupal][patch][] = "patches/0004-drupal750-1971072.patch"

View File

@ -0,0 +1,12 @@
--- a/includes/install.inc 2016-07-14 09:59:45.000000000 +0200
+++ b/includes/install.inc 2016-07-14 10:04:56.000000000 +0200
@@ -1180,9 +1180,6 @@
$info = install_profile_info($profile);
- // Add the profile as a dependency itself, in order to see if it has requirements as well.
- $info['dependencies'][] = $profile;
-
// Collect requirement testing results.
$requirements = array();
foreach ($info['dependencies'] as $module) {