From 87f883a6d50547d085f0681b02ee3d35c19b9034 Mon Sep 17 00:00:00 2001
From: lucashedding <lucashedding@1463982.no-reply.drupal.org>
Date: Mon, 3 Feb 2020 16:15:31 -0600
Subject: [PATCH] Issue #3110859 by heddn: Failing Drupal 8.9 tests

---
 src/Form/SettingsForm.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index d0202ee932..8e14652bee 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -141,9 +141,6 @@ class SettingsForm extends ConfigFormBase {
     $not_dev_core = strpos(\Drupal::VERSION, '-dev') === FALSE;
     $security_update = in_array($projects['drupal']['status'], [UpdateManagerInterface::NOT_SECURE, UpdateManagerInterface::REVOKED], TRUE);
     $recommended_release = $projects['drupal']['releases'][$projects['drupal']['recommended']];
-    $existing_minor_version = explode('.', \Drupal::VERSION, -1);
-    $recommended_minor_version = explode('.', $recommended_release['version'], -1);
-    $major_upgrade = $existing_minor_version !== $recommended_minor_version;
     $form['experimental'] = [
       '#type' => 'details',
       '#title' => $this->t('Experimental'),
@@ -154,6 +151,9 @@ class SettingsForm extends ConfigFormBase {
       ],
     ];
     if ($not_recommended_version && $not_dev_core) {
+      $existing_major_version = explode('.', \Drupal::VERSION, -2);
+      $recommended_major_version = explode('.', $recommended_release['version'], -2);
+      $major_upgrade = $existing_major_version !== $recommended_major_version;
       if ($security_update) {
         $form['experimental']['security'] = [
           '#type' => 'html_tag',
-- 
GitLab