diff -up a/comment_subject.info b/comment_subject.info
--- comment_subject.info	Thu Nov 19 02:45:12 2009
+++ comment_subject.info	Fri Jan 15 16:49:56 2010
@@ -1,11 +1,12 @@
 ; $Id: comment_subject.info,v 1.2.2.2 2009/11/19 07:41:13 sinasalek Exp $
 name = Comment subjects
 description = Provides a default comment subject: 'Re: [parent comment/node title]'.
-core = 6.x
+core = 7.x
 
-; Information added by drupal.org packaging script on 2009-11-19
-version = "6.x-1.5"
-core = "6.x"
+files[] = comment_subject.module
+
+; Information added by drupal.org packaging script
+version = "7.x-1.x-dev"
+core = "7.x"
 project = "comment_subject"
-datestamp = "1258616711"
 
diff -up a/comment_subject.module b/comment_subject.module
--- comment_subject.module	Thu Nov 19 02:41:14 2009
+++ comment_subject.module	Fri Jan 15 16:48:00 2010
@@ -1,28 +1,45 @@
 <?php
-// $Id: comment_subject.module,v 1.7.2.2 2009/11/19 07:41:13 sinasalek Exp $
+// $Id$
 
 /**
  * Implementation of hook_form_alter().
  */
 function comment_subject_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'comment_form' && $form['subject']['#default_value']=='') {
+  if ($form_id == 'comment_form' && empty($form['subject']['#default_value'])) {
     switch (arg(0)) {
       case 'node':
-        $node = node_load(array('nid' => arg(1)));
+        // comment form bellow (e.g. node/NID)
+        $node = node_load(arg(1));
         $subject = $node->title;
         break;
       case 'comment':
-        if (arg(1)=='reply') {
+        if (arg(1) == 'reply') {
           if (is_numeric(arg(3))) {
-            $comment = _comment_load(arg(3));
+            // replying to a comment (e.g. comment/reply/NID/CID)
+            $comment = comment_load(arg(3));
             $subject = $comment->subject;
-          } else {
+          }
+          else {
+            // replying to a node on a separated page (e.g. node/reply/NID)
             $node = node_load(arg(2));
             $subject = $node->title;
           }
-        } else if (arg(1)=='edit' && is_numeric(arg(2))) {
-          $comment = _comment_load(arg(2));
-          $subject = $comment->subject;
+        }
+        elseif (arg(2) == 'edit' && is_numeric(arg(1))) {
+          // editing a comment (e.g. comment/CID/edit)
+          // subject shouldn't be empty (how could it be?)
+          // therefore this point wouldn't be reached
+          //
+          // but, if for some reason (e.g. DB edit)
+          // the subject of the comment becomes empty
+          // it would require fetching its parent's title
+          // nevertheless, testing the comment->pid to decide
+          // whether to load node's title or parent's subject
+          // is too complicated logic for a case that shouldn't happen
+          // therefore, only avoid:
+          // - PHP "Notice: Undefined variable: subject"
+          // - #default_value = "Re: "
+          return; // take no action at all
         }
         break;
     }
diff -up a/README.txt b/README.txt
--- README.txt	Thu Nov 19 02:41:14 2009
+++ README.txt	Fri Jan 15 16:44:26 2010
@@ -12,4 +12,9 @@ Description
   
 Author
 -----------------
-Aldo Hoeben <aldo AT hoeben DOT net>
\ No newline at end of file
+Aldo Hoeben <aldo AT hoeben DOT net>
+
+co-maintainers
+-----------------
+arhak      http://drupal.org/user/334209
+sinasalek  http://drupal.org/user/52244
Only in .: translations