diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index 0524170..fffcf6f 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -222,7 +222,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
   if (drupal_is_cli()) {
     if ($fatal) {
       // When called from CLI, simply output a plain text message.
-      print html_entity_decode(strip_tags(t('%type: !message in %function (line %line of %file).', $error))). "\n";
+      print html_entity_decode(strip_tags(t('%type: !message in %function (line %line of %file).', $error))) . "\n";
       exit;
     }
   }
diff --git a/core/includes/form.inc b/core/includes/form.inc
index b5a13c5..199eafb 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -402,7 +402,7 @@ function form_state_defaults() {
     'submitted' => FALSE,
     'executed' => FALSE,
     'programmed' => FALSE,
-    'cache'=> FALSE,
+    'cache' => FALSE,
     'method' => 'post',
     'groups' => array(),
     'buttons' => array(),
diff --git a/core/includes/gettext.inc b/core/includes/gettext.inc
index a8498dc..176f061 100644
--- a/core/includes/gettext.inc
+++ b/core/includes/gettext.inc
@@ -354,9 +354,9 @@ function _locale_import_read_po($op, $file, $overwrite_options = NULL, $lang = N
  *   An optional line number argument.
  */
 function _locale_import_message($message, $file, $lineno = NULL) {
-  $vars = array('%filename' => $file->filename);
+  $vars = array('%filename' => check_plain($file->filename));
   if (isset($lineno)) {
-    $vars['%line'] = $lineno;
+    $vars['%line'] = check_plain($lineno);
   }
   $t = get_t();
   drupal_set_message($t($message, $vars), 'error');