Commit 967f4a1b authored by Dries's avatar Dries

- Patch #231668 by aspilicious, birdmanx35: improve comments in core to conform to standards.

parent 16c5713b
This diff is collapsed.
......@@ -155,7 +155,7 @@
$db_prefix = '';
/**
* Access control for update.php script
* Access control for update.php script.
*
* If you are updating your Drupal installation using the update.php script but
* are not logged in using either an account with the "Administer software
......
......@@ -21,10 +21,10 @@
*/
/**
* Global flag to identify update.php run, and so avoid various unwanted
* operations, such as hook_init() and hook_exit() invokes, css/js preprocessing
* and translation, and solve some theming issues. This flag is checked on several
* places in Drupal code (not just update.php).
* Global flag indicating that update.php is being run.
*
* When this flag is set, various operations do not take place, such as invoking
* hook_init() and hook_exit(), css/js preprocessing, and translation.
*/
define('MAINTENANCE_MODE', 'update');
......@@ -47,7 +47,7 @@ function update_script_selection_form($form, &$form_state) {
'#collapsible' => TRUE,
);
// Ensure system.module's updates appear first
// Ensure system.module's updates appear first.
$form['start']['system'] = array();
$updates = update_get_update_list();
......@@ -137,7 +137,8 @@ function update_script_selection_form($form, &$form_state) {
}
function update_helpful_links() {
// NOTE: we can't use l() here because the URL would point to 'update.php?q=admin'.
// NOTE: we can't use l() here because the URL would point to
// 'update.php?q=admin'.
$links[] = '<a href="' . base_path() . '">Front page</a>';
$links[] = '<a href="' . base_path() . '?q=admin">Administration pages</a>';
return $links;
......@@ -148,7 +149,7 @@ function update_results_page() {
$links = update_helpful_links();
update_task_list();
// Report end result
// Report end result.
if (module_exists('dblog')) {
$log_message = ' All errors have been <a href="' . base_path() . '?q=admin/reports/dblog">logged</a>.';
}
......@@ -174,7 +175,7 @@ function update_results_page() {
$output .= theme('item_list', array('items' => $links));
// Output a list of queries executed
// Output a list of queries executed.
if (!empty($_SESSION['update_results'])) {
$output .= '<div id="update-results">';
$output .= '<h2>The following updates returned messages</h2>';
......@@ -397,7 +398,7 @@ function update_check_requirements() {
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : '';
switch ($op) {
// update.php ops
// update.php ops.
case 'selection':
if (isset($_GET['token']) && $_GET['token'] == drupal_get_token('update')) {
......@@ -419,7 +420,7 @@ function update_check_requirements() {
$output = update_results_page();
break;
// Regular batch ops : defer to batch processing API
// Regular batch ops : defer to batch processing API.
default:
update_task_list('run');
$output = _batch_page();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment