Index: friendlist_ui/friendlist_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_ui/friendlist_ui.module,v
retrieving revision 1.1.2.29
diff -u -p -r1.1.2.29 friendlist_ui.module
--- friendlist_ui/friendlist_ui.module	2 Nov 2008 12:41:27 -0000	1.1.2.29
+++ friendlist_ui/friendlist_ui.module	5 Dec 2008 01:44:16 -0000
@@ -321,7 +321,7 @@ function friendlist_ui_get_link($op, $ac
   return $popups_body  .   l(t($link_text, array('!rt_name' => $rt->name, '!rt_name_p' => $rt->name_p)),
     $link_href,
     array(
-      'query' => 'destination='. friendlist_ui_destination(),
+      'query' => drupal_get_destination(),
       'attributes' => array(
         'class' => "$popups_style friendlist_ui_${status}_$op",
       )
@@ -422,24 +422,3 @@ function friendlist_ui_user_links($accou
   return $output;
 }
 
-function friendlist_ui_destination() {
-
-  // Get the url where we come from, and transform it in its alias.
-  $url_q = url($_GET['q']);
-
-
-  // At this point, the url will include the base_path() -- but that's
-  // not good at all! When set as destination, the base_path() mustn't be
-  // there. Take it out.
-  // P.S.
-  // Is this REALLY the only way to do this?!?!?
-  $url_q = drupal_substr($url_q, drupal_strlen(base_path())) ;
-
-  // Some debug messages
-  #drupal_set_message("$bp $q $url_q");
-  #drupal_set_message("HERE: $url_q");
-  # return drupal_substr(url($_GET['q']), 1); # HOW IT WAS
-
-  return $url_q;
-}
-