Index: fb.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/fb/fb.module,v
retrieving revision 1.114
diff -u -p -r1.114 fb.module
--- fb.module	20 Oct 2010 19:10:21 -0000	1.114
+++ fb.module	25 Oct 2010 23:59:50 -0000
@@ -178,8 +178,19 @@ function fb_init() {
       $js_settings['reload_url'] = 'http://apps.facebook.com/' . $_fb_app->canvas . '/' . fb_scrub_urls($_REQUEST['q']);
     }
     else {
-      $js_settings['reload_url'] = url(isset($_GET['q']) ? $_GET['q'] : '<front>',
-                                       array('absolute' => TRUE));
+      if (isset($_REQUEST['destination'])) {
+        $url = $_REQUEST['destination'];
+      }
+      elseif (isset($_GET['q'])) {
+        // @todo The 'user/login' exception is probably only valid when mapping
+        // Fb to Drupal accounts, since authenticated users are not allowed to
+        // visit the login page.
+        $url = $_GET['q'] != 'user/login' ? $_GET['q'] : 'user';
+      }
+      else {
+        $url = '<front>';
+      }
+      $js_settings['reload_url'] = url($url, array('absolute' => TRUE));
     }
   
   }