From 5e52176157b9ff28a3af70f27ca7fc86c97219f6 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sun, 3 Oct 2010 23:33:15 +0000
Subject: #864464 follow-up by David_Rothstein: Move notice about requiring
 latest version of Drupal so it only comes up the first time update.php is
 ran.

---
 includes/update.inc | 39 ++++++++++++++++++++++++++-------------
 update.php          | 10 ----------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/includes/update.inc b/includes/update.inc
index bc56f1e89..23b414c60 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -9,6 +9,16 @@
  * installation. It is included and used extensively by update.php.
  */
 
+/**
+ * Minimum schema version of Drupal 6 required for upgrade to Drupal 7.
+ *
+ * Upgrades from Drupal 6 to Drupal 7 require that Drupal 6 be running
+ * the most recent version, or the upgrade could fail. We can't easily
+ * check the Drupal 6 version once the update process has begun, so instead
+ * we check the schema version of system.module in the system table.
+ */
+define('REQUIRED_D6_SCHEMA_VERSION', '6055');
+
 /**
  * Disable any items in the {system} table that are not core compatible.
  */
@@ -120,20 +130,23 @@ function update_prepare_d7_bootstrap() {
   // created yet.
   drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE);
 
-  // Check to make sure that the user is running an up to date version of
-  // Drupal 6 before proceeding. Note this has to happen AFTER the database
-  // bootstraps because of drupal_get_installed_schema_version().
+  // If the site has not updated to Drupal 7 yet, check to make sure that it is
+  // running an up-to-date version of Drupal 6 before proceeding. Note this has
+  // to happen AFTER the database bootstraps because of
+  // drupal_get_installed_schema_version().
   $system_schema = drupal_get_installed_schema_version('system');
-  $has_required_schema = $system_schema >= REQUIRED_D6_SCHEMA_VERSION;
-  $requirements = array(
-    'drupal 6 version' => array(
-      'title' => 'Drupal 6 version',
-      'value' => $has_required_schema ? 'You are running a current version of Drupal 6.' : 'You are not running a current version of Drupal 6',
-      'severity' => $has_required_schema ? REQUIREMENT_OK : REQUIREMENT_ERROR,
-      'description' => $has_required_schema ? '' : 'Please update your Drupal 6 installation to the most recent version before attempting to upgrade to Drupal 7',
-    ),
-  );
-  update_extra_requirements($requirements);
+  if ($system_schema < 7000) {
+    $has_required_schema = $system_schema >= REQUIRED_D6_SCHEMA_VERSION;
+    $requirements = array(
+      'drupal 6 version' => array(
+        'title' => 'Drupal 6 version',
+        'value' => $has_required_schema ? 'You are running a current version of Drupal 6.' : 'You are not running a current version of Drupal 6',
+        'severity' => $has_required_schema ? REQUIREMENT_OK : REQUIREMENT_ERROR,
+        'description' => $has_required_schema ? '' : 'Please update your Drupal 6 installation to the most recent version before attempting to upgrade to Drupal 7',
+      ),
+    );
+    update_extra_requirements($requirements);
+  }
 
   // Create the registry tables.
   if (!db_table_exists('registry')) {
diff --git a/update.php b/update.php
index 0ade03cc2..a9bc48b8d 100644
--- a/update.php
+++ b/update.php
@@ -28,16 +28,6 @@ define('DRUPAL_ROOT', getcwd());
  */
 define('MAINTENANCE_MODE', 'update');
 
-/**
- * Minimum schema version of Drupal 6 required for upgrade to Drupal 7.
- *
- * Upgrades from Drupal 6 to Drupal 7 require that Drupal 6 be running
- * the most recent version, or the upgrade could fail. We can't easily
- * check the Drupal 6 version once the update process has begun, so instead
- * we check the schema version of system.module in the system table.
- */
-define('REQUIRED_D6_SCHEMA_VERSION', '6055');
-
 function update_selection_page() {
   drupal_set_title('Drupal database update');
   $elements = drupal_get_form('update_script_selection_form');
-- 
cgit v1.2.3