? project_issue.vmod.module ? project_issue.vnoc.module ? project_issue.vori.module Index: project_issue.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.module,v retrieving revision 1.80 diff -u -p -r1.80 project_issue.module --- project_issue.module 26 Jan 2008 06:41:51 -0000 1.80 +++ project_issue.module 1 Feb 2008 15:16:35 -0000 @@ -1081,22 +1081,12 @@ function project_issue_link_alter(&$node * * @param $node * The issue node object to be linked. - * @param $comment_id - * The comment id to be appended to the link, optional. - * @param $comment_number - * The comment's number, as visible to users, optional. */ -function theme_project_issue_issue_link($node, $comment_id = NULL, $comment_number = NULL) { +function theme_project_issue_issue_link($node) { $path = "node/$node->nid"; $attributes = array('title' => project_issue_state($node->sid)); - if ($comment_id) { - $title = "#$node->nid-$comment_number: $node->title"; - $link = l($title, $path, $attributes, NULL, "comment-$comment_id"); - } - else { - $title = "#$node->nid: $node->title"; - $link = l($title, $path, $attributes); - } + $title = "#$node->nid: $node->title"; + $link = l($title, $path, $attributes); $output = "sid\">$link"; return $output; } @@ -1107,7 +1097,7 @@ function theme_project_issue_issue_link( */ function project_issue_filter_tips($delta, $format, $long = FALSE) { if ($long) { - return t('References to project issues in the form of [#1234] (or [#1234-2] for comments) turn into links automatically, with the title of the issue appended. The status of the issue is shown on hover.'); + return t('References to project issues in the form of [#1234] turn into links automatically, with the title of the issue appended. The status of the issue is shown on hover.'); } else { return t('Project issue numbers (ex. [#12345]) turn into links automatically.'); @@ -1129,23 +1119,15 @@ function project_issue_filter($op, $delt case 'prepare': return $text; case 'process': - $regex = '(?|([^<]|(<(?!code)))*<\/code>|([^<]|(<(?!pre)))*<\/pre>|\w)'; + $regex = '(?|([^<]|(<(?!code)))*<\/code>|([^<]|(<(?!pre)))*<\/pre>|\w)'; $offset = 0; while(preg_match("/$regex/", $text, $preg_matches, PREG_OFFSET_CAPTURE, $offset)) { $offset++; $match = $preg_matches[1]; $nid = $preg_matches[2][0]; - $comment_number = $preg_matches[4][0]; $node = node_load($nid); if (is_object($node) && node_access('view', $node) && $node->type == 'project_issue') { - if (!is_null($comment_number)) { - // Pull comment id based on the comment number. - $comment_id = db_result(db_query("SELECT cid FROM {comments} WHERE nid = %d AND thread = '%s'", $nid, int2vancode($comment_number) .'/')); - $link = theme('project_issue_issue_link', $node, $comment_id, $comment_number); - } - else { - $link = theme('project_issue_issue_link', $node); - } + $link = theme('project_issue_issue_link', $node); $text = substr_replace($text, $link, $match[1], strlen($match[0])); $offset = max($offset, $match[1] + strlen($link)); }