Index: teleport.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/teleport/teleport.module,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 teleport.module
--- teleport.module	16 May 2008 23:50:53 -0000	1.1.2.11
+++ teleport.module	1 Jul 2008 22:46:27 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: teleport.module,v 1.1.2.11 2008/05/16 23:50:53 incidentist Exp $ 
+// $Id: teleport.module,v 1.1.2.11 2008/05/16 23:50:53 incidentist Exp $
 
 /**
   * @file teleport
@@ -28,7 +28,7 @@
 }
 
 /**
-  * Add three callbacks: one for completing the items, one for completing the actions, 
+  * Add three callbacks: one for completing the items, one for completing the actions,
   * and one to handle submissions.
   */
 function teleport_menu() {
@@ -77,7 +77,7 @@
   if (function_exists('user_access') && user_access("use teleport") && !(arg(0) == 'teleport' && arg(1) == 'autocomplete')) {
     drupal_add_css(drupal_get_path('module', 'teleport') . '/teleport.css');
     drupal_add_js(drupal_get_path('module', 'teleport') . '/teleport.js');
-    // Need to add this because the form with the autocomplete doesn't 
+    // Need to add this because the form with the autocomplete doesn't
     // get loaded until the footer.
     drupal_add_js('misc/autocomplete.js');
   }
@@ -136,7 +136,7 @@
     // Add close link
     $form['teleport']['links'] = array(
       '#value' => '<a href="#" id="teleport-close-link">'. t('Close') .'</a>'.'</div>',
-      );    
+      );
   }
 
   // Add settings link if user has access
@@ -199,14 +199,14 @@
     _teleport_add_to_recent($path);
     $form_state['redirect'] = $path;
     return;
-  } 
+  }
   else {
     $matches = _teleport_matches($path, FALSE);
     if (count($matches) == 1) {
       $paths = array_keys($matches);
       _teleport_add_to_recent($paths[0]);
       $form_state['redirect'] = $paths[0];
-    } 
+    }
     else {
       $form_state['redirect'] = 'teleport/results/'.$path;
     }
@@ -224,7 +224,7 @@
   if (count($matches) == 0) {
     $output .= '<p>'.t('The system could not find any matches for your search. Try again.').'</p>';
     $output .= drupal_get_form('teleport_form', FALSE);
-  } 
+  }
   else {
     $output .= '<p>'.t('The system could not determine which page you wanted to jump to. Please select from the list below.').'</p>';
     $rows = array();
@@ -293,7 +293,7 @@
   // add menu results
   $menus = menu_router_build();
   foreach ($menus as $path => $item) {
-    if (_teleport_should_include_menu_item($item, $path, $query, $aliases[$path])) {
+    if (_teleport_should_include_menu_item($item, $path, $query, isset($aliases[$path]) $aliases[$path] : $path)) {
       _teleport_add_to_matches($path, $item['title'], $matches);
     }
   }
@@ -314,8 +314,8 @@
     $result = db_query_range("SELECT nid, title FROM {node} WHERE type IN ('".join("','", $node_types)."') AND LOWER(title) LIKE LOWER('%%%s%%')", $query, 0, 10);
     while ($node = db_fetch_object($result)) {
       if (user_access('administer nodes') || node_access('view', node_load($node->nid))) {
-        _teleport_add_to_matches('node/'.$node->nid, $node->title, $matches);      
-      }  
+        _teleport_add_to_matches('node/'.$node->nid, $node->title, $matches);
+      }
     }
     // Check aliases. If the src of an alias is a node, add it to the list.
     foreach ($aliases as $src => $dst) {
@@ -339,7 +339,7 @@
   // todo: optimize this
   $result = db_query_range("SELECT tid, name FROM {term_data} WHERE LOWER(name) LIKE LOWER('%%%s%%')", $query, 0, 10);
   while ($term = db_fetch_object($result)) {
-    _teleport_add_to_matches('taxonomy/term/'.$term->tid, $term->name, $matches);    
+    _teleport_add_to_matches('taxonomy/term/'.$term->tid, $term->name, $matches);
   }
   foreach ($aliases as $src => $dst) {
     if (preg_match('/^taxonomy\/term\/(\d+)$/', $src, $tid) && isset($tid[1]) && !isset($matches[$src])) {
@@ -386,8 +386,8 @@
 function _teleport_should_include_menu_item($item, $path, $query, $alias) {
   $is_in_path = (strpos($path, $query) !== FALSE) || (strpos($alias, $query) !== FALSE);
   $is_in_title = strpos(strtolower($item['title']), $query) !== FALSE;
-  
-  return 
+
+  return
     ($is_in_path || $is_in_title) &&
     $item['type'] != MENU_CALLBACK &&
     _teleport_can_access_menu_item($item, $path);
Index: .project
===================================================================
RCS file: .project
diff -N .project
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .project	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Teleport 6</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>