Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#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.

merge-requests/26/head
Angie Byron 2010-10-03 23:33:15 +00:00
parent ae28425926
commit 5e52176157
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
includes/update.inc
View File

@ -9,6 +9,16 @@
* installation. It is included and used extensively by update.php. * 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. * Disable any items in the {system} table that are not core compatible.
*/ */
@ -120,20 +130,23 @@ function update_prepare_d7_bootstrap() {
// created yet. // created yet.
drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE);
// Check to make sure that the user is running an up to date version of // If the site has not updated to Drupal 7 yet, check to make sure that it is
// Drupal 6 before proceeding. Note this has to happen AFTER the database // running an up-to-date version of Drupal 6 before proceeding. Note this has
// bootstraps because of drupal_get_installed_schema_version(). // to happen AFTER the database bootstraps because of
// drupal_get_installed_schema_version().
$system_schema = drupal_get_installed_schema_version('system'); $system_schema = drupal_get_installed_schema_version('system');
$has_required_schema = $system_schema >= REQUIRED_D6_SCHEMA_VERSION; if ($system_schema < 7000) {
$requirements = array( $has_required_schema = $system_schema >= REQUIRED_D6_SCHEMA_VERSION;
'drupal 6 version' => array( $requirements = array(
'title' => 'Drupal 6 version', 'drupal 6 version' => array(
'value' => $has_required_schema ? 'You are running a current version of Drupal 6.' : 'You are not running a current version of Drupal 6', 'title' => 'Drupal 6 version',
'severity' => $has_required_schema ? REQUIREMENT_OK : REQUIREMENT_ERROR, 'value' => $has_required_schema ? 'You are running a current version of Drupal 6.' : 'You are not running a current version of Drupal 6',
'description' => $has_required_schema ? '' : 'Please update your Drupal 6 installation to the most recent version before attempting to upgrade to Drupal 7', '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); );
update_extra_requirements($requirements);
}
// Create the registry tables. // Create the registry tables.
if (!db_table_exists('registry')) { if (!db_table_exists('registry')) {

10
update.php
View File

@ -28,16 +28,6 @@ define('DRUPAL_ROOT', getcwd());
*/ */
define('MAINTENANCE_MODE', 'update'); 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() { function update_selection_page() {
drupal_set_title('Drupal database update'); drupal_set_title('Drupal database update');
$elements = drupal_get_form('update_script_selection_form'); $elements = drupal_get_form('update_script_selection_form');