Correct 'Comment: Link' for paged comment lists

In views showing comments there is no opportunity to provide a link of a single content that links to the correct page of a node's comments' list when paging of comments is activated(e.g. node/22?page=2#comment-1002).

So I did some work in views_comment.inc to solve this problem:

$tables['comments'] -> fields -> subject @ line 21

'fields' => array(
      'subject' => array(
        'name' => t('Comment: Subject'),
+       'query_handler' => 'views_query_handler_field_comentlink',
        'handler' => array(
          'views_handler_field_commentlink'           => t('Normal'),
          'views_handler_field_commentlink_with_mark' => t('With updated mark')
          ),
        'option' => array(
           '#type' => 'select',
           '#options' => array(
             'link' => 'As link',
             'nolink' => 'Without link'
            ),
        ),
        'addlfields' => array('cid'),
        'sortable' => TRUE,
      ),

Views output handler for link (@line 234)

/*
 * Format a field as a link to a comment.
 */
function views_handler_field_commentlink($fieldinfo, $fielddata, $value, $data) {
  if ($fielddata['options'] == 'nolink') {
    return check_plain($value);
  }
-  return l($value, "node/$data->nid", NULL, NULL, "comment-$data->comments_cid");
+  return l($value, "node/$data->nid", NULL, "page=".floor($data->comments_commentnum / _comment_get_display_setting('comments_per_page')), "comment-$data->comments_cid");
}

and views output handler for link with mark (@line 256)

/*
 * Format a field as a link to a 'mark', stating whether or not the comment has
 * updated since it was last viewed by the user.
 */
function views_handler_field_commentlink_with_mark($fieldinfo, $fielddata, $value, $data) {
  if ($fielddata['options'] == 'nolink') {
    $link = check_plain($value);
  }
  else {
-   $link = l($value, "node/$data->nid", NULL, NULL, "comment-$data->comments_cid");    
+  $link = l($value, "node/$data->nid", NULL, "page=".floor($data->comments_commentnum / _comment_get_display_setting('comments_per_page')), "comment-$data->comments_cid");
  }
  return $link .' '. theme('mark', node_mark($data->nid, $data->comments_timestamp));
}

and finally add a new query handler to the end of the file:
this is only for COMMENT_ORDER_OLDEST_FIRST & COMMENT_MODE_FLAT_EXPANDED at the moment

//note: only for chronologically ascending order
function views_query_handler_field_comentlink($field, $fieldinfo, &$query) {
	$query->add_table('comments',false,1,array('left' => array(
        'table' => 'node',
        'field' => 'nid'
      ),
      'right' => array(
        'field' => 'nid'
      ),
      'extra' => array(
        'timestamp <= comments.timestamp' => NULL,
      ),
    )
    );
  $query->add_groupby('comments.cid');
  $query->add_field('COUNT(comments2.cid)', '', $field['tablename'] . '_commentnum');
}