Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.395 diff -u -p -r1.395 system.install --- modules/system/system.install 5 Oct 2009 04:34:04 -0000 1.395 +++ modules/system/system.install 6 Oct 2009 00:20:22 -0000 @@ -66,7 +66,7 @@ function system_requirements($phase) { $requirements['php'] = array( 'title' => $t('PHP'), 'value' => $phpversion, - 'description' => $t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, please read the Enabling and disabling phpinfo() handbook page.', array('@phpinfo' => 'http://drupal.org/node/243993')), + 'description' => $t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, please read the Enabling and disabling phpinfo() handbook page.', array('!url' => 'http://drupal.org/node/243993')), 'severity' => REQUIREMENT_INFO, ); } @@ -87,7 +87,7 @@ function system_requirements($phase) { // (register_globals off), when it is in fact on. We can only guarantee // register_globals is off if the value returned is 'off', '', or 0. if (!empty($register_globals) && strtolower($register_globals) != 'off') { - $requirements['php_register_globals']['description'] = $t('register_globals is enabled. Drupal requires this configuration directive to be disabled. Your site may not be secure when register_globals is enabled. The PHP manual has instructions for how to change configuration settings.'); + $requirements['php_register_globals']['description'] = $t('register_globals is enabled. Drupal requires this configuration directive to be disabled. Your site may not be secure when register_globals is enabled. The PHP manual has instructions for how to change configuration settings.', array('!url' => 'http://php.net/configuration.changes')); $requirements['php_register_globals']['severity'] = REQUIREMENT_ERROR; $requirements['php_register_globals']['value'] = $t("Enabled ('@value')", array('@value' => $register_globals)); } @@ -122,7 +122,7 @@ function system_requirements($phase) { $description .= ' ' . $t('Contact your system administrator or hosting provider for assistance with increasing your PHP memory limit.'); } - $requirements['php_memory_limit']['description'] = $description . ' ' . $t('See the Drupal requirements for more information.', array('@url' => 'http://drupal.org/requirements')); + $requirements['php_memory_limit']['description'] = $description . ' ' . $t('See the Drupal requirements for more information.', array('!url' => 'http://drupal.org/requirements')); $requirements['php_memory_limit']['severity'] = REQUIREMENT_WARNING; } } @@ -159,7 +159,7 @@ function system_requirements($phase) { // Cron error threshold defaults to two weeks. $threshold_error = variable_get('cron_threshold_error', 1209600); // Cron configuration help text. - $help = $t('For more information, see the online handbook entry for configuring cron jobs.', array('@cron-handbook' => 'http://drupal.org/cron')); + $help = $t('For more information, see the online handbook entry for configuring cron jobs.', array('!url' => 'http://drupal.org/cron')); // Determine when cron last ran. $cron_last = variable_get('cron_last'); @@ -228,7 +228,7 @@ function system_requirements($phase) { elseif ($phase == 'install') { // For the installer UI, we need different wording. 'value' will // be treated as version, so provide none there. - $description = $error . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually, or ensure that the installer has the permissions to create it automatically. For more information, please see INSTALL.txt or the online handbook.', array('@handbook_url' => 'http://drupal.org/server-permissions')); + $description = $error . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually, or ensure that the installer has the permissions to create it automatically. For more information, please see INSTALL.txt or the online handbook.', array('!url' => 'http://drupal.org/server-permissions')); $requirements['file system']['value'] = ''; } if (!empty($description)) { @@ -307,7 +307,7 @@ function system_requirements($phase) { $requirements['update status'] = array( 'value' => $t('Not enabled'), 'severity' => REQUIREMENT_WARNING, - 'description' => $t('Update notifications are not enabled. It is highly recommended that you enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/config/modules'))), + 'description' => $t('Update notifications are not enabled. It is highly recommended that you enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('!update' => 'http://drupal.org/handbook/modules/update', '!module' => url('admin/config/modules'))), ); } else { @@ -1573,10 +1573,10 @@ function system_update_7000() { $renamed_permission = preg_replace('/(?<=^|,\ )edit\ own\ forum\ topics(?=,|$)/', 'edit own forum content', $role->perm); if ($renamed_permission != $role->perm) { - db_update('permission') - ->fields(array('perm' => $renamed_permission)) - ->condition('rid', $role->rid) - ->execute(); + db_update('permission') + ->fields(array('perm' => $renamed_permission)) + ->condition('rid', $role->rid) + ->execute(); } } } @@ -1622,7 +1622,7 @@ function system_update_7002() { * Update {blocked_ips} with valid IP addresses from {access}. */ function system_update_7003() { - $messages = array(); + $messages = array(); $type = 'host'; $result = db_query("SELECT mask FROM {access} WHERE status = :status AND type = :type", array( ':status' => 0, @@ -1630,9 +1630,9 @@ function system_update_7003() { )); foreach ($result as $blocked) { if (filter_var($blocked->mask, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) !== FALSE) { - db_insert('blocked_ips') - ->fields(array('ip' => $blocked->mask)) - ->execute(); + db_insert('blocked_ips') + ->fields(array('ip' => $blocked->mask)) + ->execute(); } else { $invalid_host = check_plain($blocked->mask); @@ -1701,11 +1701,11 @@ function system_update_7004(&$sandbox) { )) ->fetchField(); if ($block_exists) { - db_update($table) - ->fields(array('delta' => $new_delta)) - ->condition('module', $module) - ->condition('delta', $old_delta) - ->execute(); + db_update($table) + ->fields(array('delta' => $new_delta)) + ->condition('module', $module) + ->condition('delta', $old_delta) + ->execute(); } } } @@ -1894,10 +1894,10 @@ function system_update_7008() { * */ function system_update_7009() { - db_update('variable') - ->fields(array('name' => 'main_menu_links_source')) - ->condition('name', 'menu_primary_links_source') - ->execute(); + db_update('variable') + ->fields(array('name' => 'main_menu_links_source')) + ->condition('name', 'menu_primary_links_source') + ->execute(); } /** @@ -2306,10 +2306,10 @@ function system_update_7022() { * Change the PHP for settings permission. */ function system_update_7023() { - db_update('role_permission') - ->fields(array('permission' => 'use PHP for settings')) - ->condition('permission', 'use PHP for block visibility') - ->execute(); + db_update('role_permission') + ->fields(array('permission' => 'use PHP for settings')) + ->condition('permission', 'use PHP for block visibility') + ->execute(); } /**