--- comment.module~	2006-02-09 20:25:19.000000000 +0100
+++ comment.module	2006-02-13 10:46:48.000000000 +0100
@@ -1580,10 +1580,10 @@
     }
 
     if (variable_get('user_register', 1)) {
-      return t('<a href="%login">login</a> or <a href="%register">register</a> to post comments', array('%login' => url('user/login', $destination, 'comment-form'), '%register' => url('user/register', $destination, 'comment-form')));
+      return t('<a href="%login">login</a> or <a href="%register">register</a> to post comments', array('%login' => drupal_urlencode(url('user/login', $destination, 'comment-form')), '%register' => check_url(url('user/register', $destination, 'comment-form'))));
     }
     else {
-      return t('<a href="%login">login</a> to post comments', array('%login' => url('user/login', $destination, 'comment-form')));
+      return t('<a href="%login">login</a> to post comments', array('%login' => drupal_urlencode(url('user/login', $destination, 'comment-form'))));
     }
   }
 }