Merge branch '6.x-1.x' of git.drupal.org:sandbox/spficklin/1337878 into 6.x-1.x

tripal_pub/includes/pub_search.inc

@@ -56,7 +56,7 @@ function tripal_pub_search_page() {
       $title = htmlspecialchars($pub->title);
       $result = $title;
       if ($pub->nid) {
-        $result = l($title ,'pub/' . $pub->pub_id, array('attributes' => array('target' => '_blank')));
+        $result = l($title ,'node/' . $pub->nid, array('attributes' => array('target' => '_blank')));
       }      
       if ($citation_rec->value) {
         $citation = htmlspecialchars($citation_rec->value);
@@ -513,4 +513,4 @@ function tripal_pub_get_search_results($search_array, $limit, $pager_id) {
   $args = array_merge($fargs, $wargs);
   //dpm(array($mode, $sql, $args));
   return chado_pager_query($sql, $limit, $pager_id, $count, $args);
-}
+}