Index: linkit.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/linkit/linkit.js,v
retrieving revision 1.6.2.2
diff -u -r1.6.2.2 linkit.js
--- linkit.js	24 Jan 2011 18:22:31 -0000	1.6.2.2
+++ linkit.js	30 Jan 2011 21:11:24 -0000
@@ -46,7 +46,7 @@
    * See if the link contains a #anchor
    */
   seek_for_anchor : function(href) {
-    var matches = href.match(/internal:.*(#.*)/i);
+    var matches = href.match(/.*(#.*)/i);
     anchor = (matches == null) ? '' : matches[1].substring(1);
     return anchor;
   }
Index: plugins/linkit_file/linkit_file.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/linkit/plugins/linkit_file/linkit_file.module,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 linkit_file.module
--- plugins/linkit_file/linkit_file.module	6 Jan 2011 04:55:38 -0000	1.2.2.3
+++ plugins/linkit_file/linkit_file.module	30 Jan 2011 21:12:20 -0000
@@ -20,13 +20,15 @@
     ->condition('f.status' , '1')
     ->condition('f.uri', 'public://%', 'LIKE')
     ->execute();
+
+  $public_path = variable_get('file_public_path', conf_path() . '/files');
   foreach ($result AS $file) {
     $matches['file'][] = array(
       'title' => $file->filename,
-      'path' => file_create_url($file->uri),
+      'path' => $public_path . '/' . file_uri_target($file->uri),
       'information' => array(
         'type' => 'File',
-        'filemine' => $file->filemime,
+        'mimetype' => $file->filemime,
       ),
     );
   }
Index: plugins/linkit_node/linkit_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/linkit/plugins/linkit_node/linkit_node.module,v
retrieving revision 1.13.2.3
diff -u -r1.13.2.3 linkit_node.module
--- plugins/linkit_node/linkit_node.module	13 Jan 2011 17:00:46 -0000	1.13.2.3
+++ plugins/linkit_node/linkit_node.module	31 Jan 2011 22:34:41 -0000
@@ -59,7 +59,7 @@
   foreach ($result AS $node) {
     $matches['node'][$i] = array(
       'title' => $node->title,
-      'path' => 'internal:node/' . $node->nid,
+      'path' => 'node/' . $node->nid,
       'information' => array(
         'type' => 'Node',
       ),
@@ -106,20 +106,17 @@
  * Implements hook_linkit_get_search_styled_link().
  */
 function linkit_node_linkit_get_search_styled_link($string) {
-  // Node links created with Linkit will always begin with "internal:"
-  if (strpos($string, 'internal:') === FALSE) {
-    return;
-  }
-
   // Check to see that the link really is a node link
-  $splitted_string = explode('/', str_replace('internal:', '', $string));
+  // Backwards compatible with internal: links
+  $escaped_string = str_replace('internal:', '', $string);
+  $splitted_string = explode('/', $escaped_string);
   if ($splitted_string[0] != 'node') {
     return;
   }
 
   // This is a node link created with Linkit, try to grab the title and path now. 
   $result = db_select('node', 'n')
-    ->fields('n', array('nid', 'title'))
+    ->fields('n', array('title'))
     ->condition('n.nid', $splitted_string[1])
     ->addTag('node_access')
     ->execute()
@@ -129,7 +126,7 @@
   if (!$result) {
     return;
   }
-  return check_plain($result->title) . ' [path:internal:node/' . $result->nid . ']';
+  return check_plain($result->title) . ' [path:' . $escaped_string . ']';
 }
 
 /**
Index: plugins/linkit_taxonomy/linkit_taxonomy.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/linkit/plugins/linkit_taxonomy/linkit_taxonomy.module,v
retrieving revision 1.9.2.3
diff -u -r1.9.2.3 linkit_taxonomy.module
--- plugins/linkit_taxonomy/linkit_taxonomy.module	24 Jan 2011 20:02:00 -0000	1.9.2.3
+++ plugins/linkit_taxonomy/linkit_taxonomy.module	31 Jan 2011 22:34:11 -0000
@@ -59,21 +59,18 @@
  * Implements hook_linkit_get_search_styled_link().
  */
 function linkit_taxonomy_linkit_get_search_styled_link($string) {
-  // Term links created with Linkit will always begin with "internal:"
-  if (strpos($string, 'internal:') === FALSE) {
-    return;
-  }
-
   // Check to see that the link really is a term link
-  $splitted_string = explode('/', str_replace('internal:', '', $string));
-  if ($splitted_string[0] != 'taxonomy') {
+  // Backwards compatible with internal: links
+  $escaped_string = str_replace('internal:', '', $string);
+  $splitted_string = explode('/', $escaped_string);
+  if ($splitted_string[0] != 'taxonomy' && $splitted_string[0] != 'forum') {
     return;
   }
   
   // This is a term link created with Linkit, try to grab the title and path now.
   $result = db_select('taxonomy_term_data', 't')
     ->fields('t', array('tid', 'name'))
-    ->condition('t.tid', $splitted_string[2])
+    ->condition('t.tid', $splitted_string[count($splitted_string)-1])
     ->addTag('term_access')
     ->execute()
     ->fetchObject();
@@ -82,8 +79,7 @@
   if (!$result) {
     return;
   }
-
-  return check_plain($result->name) . ' [path:internal:taxonomy/term/' . $result->tid . ']';
+  return check_plain($result->name) . ' [path:' . $escaped_string . ']';
 }
 
 /**
Index: plugins/linkit_user/linkit_user.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/linkit/plugins/linkit_user/linkit_user.module,v
retrieving revision 1.6.2.2
diff -u -r1.6.2.2 linkit_user.module
--- plugins/linkit_user/linkit_user.module	6 Jan 2011 04:55:38 -0000	1.6.2.2
+++ plugins/linkit_user/linkit_user.module	31 Jan 2011 22:32:57 -0000
@@ -21,7 +21,7 @@
   foreach ($result AS $user) {
     $matches['user'][] = array(
       'title' => $user->name,
-      'path' => 'internal:user/' . $user->uid,
+      'path' => 'user/' . $user->uid,
       'information' => array(
         'type' => 'User',
       ),
@@ -36,20 +36,17 @@
  * Implements hook_linkit_get_search_styled_link().
  */
 function linkit_user_linkit_get_search_styled_link($string) {
-  // User links created with Linkit will always begin with "internal:"
-  if (strpos($string, 'internal:') === FALSE) {
-    return;
-  }
-
   // Check to see that the link really is a user link
-  $splitted_string = explode('/', str_replace('internal:', '', $string));
+  // Backwards compatible with internal: links
+  $escaped_string = str_replace('internal:', '', $string);
+  $splitted_string = explode('/', $escaped_string);
   if ($splitted_string[0] != 'user') {
     return;
   }
 
   // This is a node link created with Linkit, try to grab the title and path now.
   $result = db_select('users', 'u')
-    ->fields('u', array('uid', 'name'))
+    ->fields('u', array('name'))
     ->condition('u.uid', $splitted_string[1])
     ->execute()
     ->fetchObject();
@@ -59,7 +56,7 @@
     return;
   }
 
-  return check_plain($result->name) . ' [path:internal:user/' . $result->uid . ']';
+  return check_plain($result->name) . ' [path:' . $escaped_string . ']';
 }
 
 /**