diff --git a/.htaccess b/.htaccess index c32b182..0ad7be3 100644 --- a/.htaccess +++ b/.htaccess @@ -129,7 +129,7 @@ DirectoryIndex index.php index.html index.htm # Note: The following URI conditions are not anchored at the start (^), # because Drupal may be located in a subdirectory. To further improve # security, you can replace '!/' with '!^/'. - # Allow access to PHP files in /core (like update.php or install.php): + # Allow access to PHP files in /core (like authorize.php or install.php): RewriteCond %{REQUEST_URI} !/core/[^/]*\.php$ # Allow access to test-specific PHP files: RewriteCond %{REQUEST_URI} !/core/modules/system/tests/https?.php$ diff --git a/core/UPGRADE.txt b/core/UPGRADE.txt index 420f6ad..7c70050 100644 --- a/core/UPGRADE.txt +++ b/core/UPGRADE.txt @@ -95,7 +95,7 @@ following the instructions in the INTRODUCTION section at the top of this file: 5. Re-apply any modifications to files such as .htaccess or robots.txt. -6. Run update.php by visiting http://www.example.com/core/update.php (replace +6. Run update.php by visiting http://www.example.com/update.php (replace www.example.com with your domain name). This will update the core database tables. diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 8514448..44c1ebb 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -815,8 +815,8 @@ protected function initializeRequestGlobals(Request $request) { // For a request URI of '/index.php/foo', $_SERVER['SCRIPT_NAME'] is // '/index.php', whereas $_SERVER['PHP_SELF'] is '/index.php/foo'. if ($dir = rtrim(dirname($request->server->get('SCRIPT_NAME')), '\/')) { - // Remove "core" directory if present, allowing install.php, update.php, - // and others to auto-detect a base path. + // Remove "core" directory if present, allowing install.php, + // authorize.php, and others to auto-detect a base path. $core_position = strrpos($dir, '/core'); if ($core_position !== FALSE && strlen($dir) - 5 == $core_position) { $base_path = substr($dir, 0, $core_position); @@ -852,7 +852,7 @@ protected function initializeRequestGlobals(Request $request) { if (strpos(request_uri(TRUE) . '/', $base_path . $script_path) !== 0) { $script_path = ''; } - // @todo Temporary BC for install.php, update.php, and other scripts. + // @todo Temporary BC for install.php, authorize.php, and other scripts. // - http://drupal.org/node/1547184 // - http://drupal.org/node/1546082 if ($script_path !== 'index.php/') { @@ -888,7 +888,7 @@ protected function initializeCookieGlobals(Request $request) { // to use the same session identifiers across HTTP and HTTPS. $session_name = $request->getHost() . $request->getBasePath(); // Replace "core" out of session_name so core scripts redirect properly, - // specifically install.php and update.php. + // specifically install.php. $session_name = preg_replace('/\/core$/', '', $session_name); // HTTP_HOST can be modified by a visitor, but has been sanitized already // in DrupalKernel::bootEnvironment(). diff --git a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php index 3bdb0a3..19436b0 100644 --- a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php +++ b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php @@ -26,10 +26,11 @@ public function __construct(TranslationInterface $string_translation) { $title = $this->t('Drupal already installed'); $message = $this->t('', array( '!base-url' => $GLOBALS['base_url'], + '!update-url' => $GLOBALS['base_path'] . 'update.php', )); parent::__construct($message, $title); } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index b9c1b83..34cd55b 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -447,7 +447,7 @@ function system_requirements($phase) { if (max($updates) > $default) { $requirements['update']['severity'] = REQUIREMENT_ERROR; $requirements['update']['value'] = t('Out of date'); - $requirements['update']['description'] = t('Some modules have database schema updates to install. You should run the database update script immediately.', array('@update' => base_path() . 'core/update.php')); + $requirements['update']['description'] = t('Some modules have database schema updates to install. You should run the database update script immediately.', array('@update' => \Drupal::url('system.db_update'))); break; } } diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 54deb65..1bdd6d6 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -111,14 +111,14 @@ function system_help($route_name, RouteMatchInterface $route_match) { $output = '

' . t('Download additional contributed modules to extend Drupal\'s functionality.', array('@modules' => 'http://drupal.org/project/modules')) . '

'; if (\Drupal::moduleHandler()->moduleExists('update')) { if (update_manager_access()) { - $output .= '

' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => $base_url . '/core/update.php', '@updates' => url('admin/reports/updates'))) . '

'; + $output .= '

' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => \Drupal::url('system.db_update'), '@updates' => url('admin/reports/updates'))) . '

'; } else { - $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => $base_url . '/core/update.php', '@updates' => url('admin/reports/updates'))) . '

'; + $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => \Drupal::url('system.db_update'), '@updates' => url('admin/reports/updates'))) . '

'; } } else { - $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated. Enable the Update Manager module to update and install modules and themes.', array('@update-php' => $base_url . '/core/update.php')) . '

'; + $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated. Enable the Update Manager module to update and install modules and themes.', array('@update-php' => \Drupal::url('system.db_update'))) . '

'; } return $output; diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc index 3bfdbcf..8709e56 100644 --- a/core/modules/update/update.authorize.inc +++ b/core/modules/update/update.authorize.inc @@ -227,7 +227,7 @@ function update_authorize_update_batch_finished($success, $results) { // Since we're doing an update of existing code, always add a task for // running update.php. $results['tasks'][] = t('Your modules have been downloaded and updated.'); - $results['tasks'][] = t('Run database updates', array('@update' => base_path() . 'core/update.php')); + $results['tasks'][] = t('Run database updates', array('@update' => \Drupal::url('system.db_update'))); // Unset the variable since it is no longer needed. unset($_SESSION['maintenance_mode']); diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 4201e5d..bb33d7a 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -598,7 +598,7 @@ function update_verify_update_archive($project, $archive_file, $directory) { // Make sure this isn't a tarball of Drupal core. if ( file_exists("$directory/$project/index.php") - && file_exists("$directory/$project/core/update.php") + && file_exists("$directory/$project/core/install.php") && file_exists("$directory/$project/core/includes/bootstrap.inc") && file_exists("$directory/$project/core/modules/node/node.module") && file_exists("$directory/$project/core/modules/system/system.module") diff --git a/core/scripts/drupal.sh b/core/scripts/drupal.sh index 9514341..de8e864 100755 --- a/core/scripts/drupal.sh +++ b/core/scripts/drupal.sh @@ -44,7 +44,7 @@ i.e. if URI is set to http://default/bar/foo.php and bar/foo.php exists, this script will be executed without bootstrapping Drupal. To execute Drupal's update.php, specify - http://default/core/update.php as the URI. + http://default/update.php as the URI. To run this script without --root argument invoke it from the root directory