diff --git a/modules/color/color.install b/modules/color/color.install index cd8162ea185..165d1315865 100644 --- a/modules/color/color.install +++ b/modules/color/color.install @@ -18,14 +18,14 @@ function color_requirements($phase) { } else { $requirements['gd']['severity'] = REQUIREMENT_ERROR; - $requirements['gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/ref.image.php')); + $requirements['gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php')); } } else { $requirements['gd'] = array( 'value' => t('Not installed'), 'severity' => REQUIREMENT_ERROR, - 'description' => t('The GD library for PHP is missing or outdated. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/ref.image.php')), + 'description' => t('The GD library for PHP is missing or outdated. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php')), ); } $requirements['gd']['title'] = t('GD library'); diff --git a/modules/color/color.module b/modules/color/color.module index d336f708079..0f1d41fe384 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -264,7 +264,7 @@ function color_scheme_form_submit($form, &$form_state) { $usage = memory_get_usage(); $limit = parse_size(ini_get('memory_limit')); if ($usage + $required > $limit) { - drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $limit), '@url' => 'http://www.php.net/manual/en/ini.core.php#ini.sect.resource-limits')), 'error'); + drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the PHP documentation for more information.', array('%size' => format_size($usage + $required - $limit), '@url' => 'http://www.php.net/manual/ini.core.php#ini.sect.resource-limits')), 'error'); return; } } diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index c289272447e..7d087fe95e3 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -11,7 +11,7 @@ * Menu callback; presents the node editing form, or redirects to delete confirmation. */ function node_page_edit($node) { - drupal_set_title($node->title); + drupal_set_title(check_plain($node->title)); return drupal_get_form($node->type . '_node_form', $node); } diff --git a/modules/syslog/syslog.module b/modules/syslog/syslog.module index 04fe995b5e3..44a08a4bbaa 100644 --- a/modules/syslog/syslog.module +++ b/modules/syslog/syslog.module @@ -20,7 +20,7 @@ function syslog_help($path, $arg) { switch ($path) { case 'admin/help#syslog': $output = '

' . t("The syslog module enables Drupal to send messages to the operating system's logging facility.") . '

'; - $output .= '

' . t('Syslog is an operating system administrative logging tool, and provides valuable information for use in system management and security auditing. Most suited to medium and large sites, syslog provides filtering tools that allow messages to be routed by type and severity. On UNIX/Linux systems, the file /etc/syslog.conf defines this routing configuration; on Microsoft Windows, all messages are sent to the Event Log. For more information on syslog facilities, severity levels, and how to set up a syslog.conf file, see UNIX/Linux syslog.conf and PHP\'s openlog and syslog functions.', array('@syslog_conf' => url('http://www.rt.com/man/syslog.5.html'), '@php_openlog' => url('http://www.php.net/manual/en/function.openlog.php'), '@php_syslog' => url('http://www.php.net/manual/en/function.syslog.php'))) . '

'; + $output .= '

' . t('Syslog is an operating system administrative logging tool, and provides valuable information for use in system management and security auditing. Most suited to medium and large sites, syslog provides filtering tools that allow messages to be routed by type and severity. On UNIX/Linux systems, the file /etc/syslog.conf defines this routing configuration; on Microsoft Windows, all messages are sent to the Event Log. For more information on syslog facilities, severity levels, and how to set up a syslog.conf file, see UNIX/Linux syslog.conf and PHP\'s openlog and syslog functions.', array('@syslog_conf' => url('http://www.rt.com/man/syslog.5.html'), '@php_openlog' => url('http://www.php.net/manual/function.openlog.php'), '@php_syslog' => url('http://www.php.net/manual/function.syslog.php'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Syslog module.', array('@syslog' => 'http://drupal.org/handbook/modules/syslog')) . '

'; return $output; }