Index: flag_content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag_content/flag_content.module,v
retrieving revision 1.6.2.12.2.3
diff -u -p -r1.6.2.12.2.3 flag_content.module
--- flag_content.module	1 Jun 2008 04:50:24 -0000	1.6.2.12.2.3
+++ flag_content.module	19 Jun 2008 09:12:29 -0000
@@ -491,27 +491,27 @@ function _flag_content_check($eid, $type
 }
 
 function theme_flag_content_mail($entry = NULL, $type = FLAG_CONTENT_TYPE_NODE, $name, $mail, $reason) {
-  global $user, $base_url;
+  global $user;
   switch ($type) {
     case FLAG_CONTENT_TYPE_NODE:
       $title = $entry->title;
       $eid = $entry->nid;
-      $path = "$type/$eid";
+      $path = url("$type/$eid", NULL, NULL, 1);
       break;
     case FLAG_CONTENT_TYPE_USER:
       $title = $entry->name;
       $eid = $entry->uid;
-      $path = "$type/$eid";
+      $path = url("$type/$eid", NULL, NULL, 1);
       break;
     case FLAG_CONTENT_TYPE_COMMENT:
       $title = $entry->subject;
       $eid = $entry->cid;
-      $path = url('node/' . $entry->nid, NULL, NULL, 0) . "#comment-" . $entry->cid;
+      $path = url('node/' . $entry->nid, NULL, NULL, 1) . "#comment-" . $entry->cid;
       break;
   }
 
   if ($user->uid) {
-    $user_url = $base_url . base_path() . "user/$user->uid";
+    $user_url = url("user/$user->uid", NULL, NULL, 1);
   }
   else {
     $user_url = t('n/a');
@@ -525,13 +525,13 @@ function theme_flag_content_mail($entry 
     ));
   $body .= t("\nItem: @title (@entry_url)", array(
     '@title'     => $title,
-    '@entry_url' => $base_url . base_path() . $path,
+    '@entry_url' => $path,
     ));
   $body .= t("\nReason: @reason", array(
     '@reason' => $reason,
     ));
   $body .= t("\n\nManage the flagged items list at @manage", array(
-    '@manage' => $base_url . base_path() . 'admin/content/flag_content',
+    '@manage' => url('admin/content/flag_content', NULL, NULL, 1),
     ));
 
   $to = check_plain($to);