1 files changed, 50 insertions, 2 deletions

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 69939a657..094406c91 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -160,7 +160,7 @@ sub bug {
     my $self = shift;
 
     require Bugzilla::Bug;
-    $self->{bug} ||= Bugzilla::Bug->new($self->bug_id);
+    $self->{bug} ||= Bugzilla::Bug->new({ id => $self->bug_id, cache => 1 });
     return $self->{bug};
 }
 
@@ -415,6 +415,53 @@ sub datasize {
     return $self->{datasize};
 }
 
+=over
+
+=item C<linecount>
+
+the number of lines of the attachment content
+
+=back
+
+=cut
+
+# linecount allows for getting the number of lines of an attachment
+# from the database directly if the data has not yet been loaded for
+# performance reasons.
+
+sub linecount {
+    my ($self) = @_;
+
+    return $self->{linecount} if exists $self->{linecount};
+
+    # Limit this to just text/* attachments as this could
+    # cause strange results for binary attachments.
+    return if $self->contenttype !~ /^text\//;
+
+    # If the data has already been loaded, we can just determine
+    # line count from the data directly. 
+    if ($self->{data}) {
+        $self->{linecount} = $self->{data} =~ tr/\n/\n/;
+    }
+    else {
+        $self->{linecount} = 
+            int(Bugzilla->dbh->selectrow_array("
+                SELECT LENGTH(attach_data.thedata)-LENGTH(REPLACE(attach_data.thedata,'\n',''))/LENGTH('\n') 
+                FROM attach_data WHERE id = ?", undef, $self->id));
+    
+    }
+
+    # If we still do not have a linecount either the attachment
+    # is stored in a local file or has been deleted. If the former,
+    # we call self->data to force a load from the filesystem and
+    # then do a split on newlines and count again.
+    unless ($self->{linecount}) {
+        $self->{linecount} = $self->data =~ tr/\n/\n/;
+    }
+
+    return $self->{linecount};
+}
+
 sub _get_local_filename {
     my $self = shift;
     my $hash = ($self->id % 100) + 100;
@@ -458,7 +505,8 @@ sub flag_types {
     my $vars = { target_type  => 'attachment',
                  product_id   => $self->bug->product_id,
                  component_id => $self->bug->component_id,
-                 attach_id    => $self->id };
+                 attach_id    => $self->id, 
+                 active_or_has_flags => $self->bug_id };
 
     $self->{flag_types} = Bugzilla::Flag->_flag_types($vars);
     return $self->{flag_types};