Index: securesite.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/securesite/securesite.module,v
retrieving revision 1.24.2.81
diff -u -p -r1.24.2.81 securesite.module
--- securesite.module	25 Sep 2008 00:49:52 -0000	1.24.2.81
+++ securesite.module	29 Oct 2008 21:00:02 -0000
@@ -234,8 +234,12 @@ function securesite_init() {
   }
 
   // Step #2: Process password resets
-  if (strpos(request_uri(), $base_path .'user/reset/') === 0) {
+  if (strpos($_GET['q'], 'user/reset/') === 0 || module_exists('i18n') && i18n_selection_mode() != 'off' && strpos($_GET['q'], i18n_selection_mode('params') .'/user/reset/') === 0) {
     $args = explode('/', $_GET['q']);
+    if (module_exists('i18n') && i18n_selection_mode() != 'off' && i18n_selection_mode('params') != '') {
+      // Remove the language argument.
+      array_shift($args);
+    }
 
     // The password reset function doesn't work well if it doesn't have all the
     // required parameters or if the UID parameter isn't valid