From: stronk7 <stronk7>
Date: Thu, 21 Sep 2006 09:35:20 +0000 (+0000)
Subject: Moved assignment_submission->comment to submissioncomment
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ea6432fede9f28e177cb9234a3faac5b5cc61329;p=moodle.git

Moved assignment_submission->comment to submissioncomment
(because comment is DB reserved word)
---

diff --git a/mod/assignment/backuplib.php b/mod/assignment/backuplib.php
index e02e9fa052..747df2bb94 100644
--- a/mod/assignment/backuplib.php
+++ b/mod/assignment/backuplib.php
@@ -112,7 +112,7 @@
                 fwrite ($bf,full_tag("DATA1",6,false,$ass_sub->data1));       
                 fwrite ($bf,full_tag("DATA2",6,false,$ass_sub->data2));       
                 fwrite ($bf,full_tag("GRADE",6,false,$ass_sub->grade));       
-                fwrite ($bf,full_tag("COMMENT",6,false,$ass_sub->comment));       
+                fwrite ($bf,full_tag("SUBMISSIONCOMMENT",6,false,$ass_sub->submissioncomment));       
                 fwrite ($bf,full_tag("FORMAT",6,false,$ass_sub->format));       
                 fwrite ($bf,full_tag("TEACHER",6,false,$ass_sub->teacher));       
                 fwrite ($bf,full_tag("TIMEMARKED",6,false,$ass_sub->timemarked));       
diff --git a/mod/assignment/db/install.xml b/mod/assignment/db/install.xml
index bc95d668c2..68515329c6 100644
--- a/mod/assignment/db/install.xml
+++ b/mod/assignment/db/install.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="mod/assignment/db" VERSION="20060807" COMMENT="XMLDB file for Moodle mod/assignment">
+<XMLDB PATH="mod/assignment/db" VERSION="20060921" COMMENT="XMLDB file for Moodle mod/assignment"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
+>
   <TABLES>
     <TABLE NAME="assignment" COMMENT="Defines assignments" NEXT="assignment_submissions">
       <FIELDS>
@@ -40,9 +43,9 @@
         <FIELD NAME="numfiles" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemodified" NEXT="data1"/>
         <FIELD NAME="data1" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="numfiles" NEXT="data2"/>
         <FIELD NAME="data2" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="data1" NEXT="grade"/>
-        <FIELD NAME="grade" TYPE="int" LENGTH="11" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="data2" NEXT="comment"/>
-        <FIELD NAME="comment" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="grade" NEXT="format"/>
-        <FIELD NAME="format" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="comment" NEXT="teacher"/>
+        <FIELD NAME="grade" TYPE="int" LENGTH="11" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="data2" NEXT="submissioncomment"/>
+        <FIELD NAME="submissioncomment" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="grade" NEXT="format"/>
+        <FIELD NAME="format" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="submissioncomment" NEXT="teacher"/>
         <FIELD NAME="teacher" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="format" NEXT="timemarked"/>
         <FIELD NAME="timemarked" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="teacher" NEXT="mailed"/>
         <FIELD NAME="mailed" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timemarked"/>
diff --git a/mod/assignment/db/migrate2utf8.xml b/mod/assignment/db/migrate2utf8.xml
index dcd75f8a08..4122cf3c63 100755
--- a/mod/assignment/db/migrate2utf8.xml
+++ b/mod/assignment/db/migrate2utf8.xml
@@ -30,7 +30,7 @@
                  AND ass.id = RECORDID
           </SQL_DETECT_COURSE>
         </FIELD>
-        <FIELD name="comment" method="PLAIN_SQL_UPDATE" type="text" length="0">
+        <FIELD name="submissioncomment" method="PLAIN_SQL_UPDATE" type="text" length="0">
           <SQL_DETECT_USER>
            SELECT ass.teacher as userid
            FROM {$CFG->prefix}assignment_submissions ass
diff --git a/mod/assignment/db/mysql.php b/mod/assignment/db/mysql.php
index e25a709c43..54704ac755 100644
--- a/mod/assignment/db/mysql.php
+++ b/mod/assignment/db/mysql.php
@@ -159,6 +159,10 @@ function assignment_upgrade($oldversion) {
         assignment_refresh_events();
     }
 
+    if ($oldversion < 2006092100) {
+        table_column('assignment_submissions', 'comment', 'submissioncomment', 'text', '', '', '');
+    }
+
 
 /// These lines ALWAYS need to be here at the end of this file.  Don't mess with them. :-)
     include_once("$CFG->dirroot/mod/assignment/lib.php");
diff --git a/mod/assignment/db/mysql.sql b/mod/assignment/db/mysql.sql
index cac154c50b..7ddd944598 100644
--- a/mod/assignment/db/mysql.sql
+++ b/mod/assignment/db/mysql.sql
@@ -41,7 +41,7 @@ CREATE TABLE `prefix_assignment_submissions` (
   `data1` text NOT NULL default '',
   `data2` text NOT NULL default '',
   `grade` int(11) NOT NULL default '0',
-  `comment` text NOT NULL default '',
+  `submissioncomment` text NOT NULL default '',
   `format` tinyint(4) unsigned NOT NULL default '0',
   `teacher` int(10) unsigned NOT NULL default '0',
   `timemarked` int(10) unsigned NOT NULL default '0',
diff --git a/mod/assignment/db/postgres7.php b/mod/assignment/db/postgres7.php
index 0a2e1fc752..3734058279 100644
--- a/mod/assignment/db/postgres7.php
+++ b/mod/assignment/db/postgres7.php
@@ -167,6 +167,10 @@ function assignment_upgrade($oldversion) {
         modify_database('','ALTER TABLE prefix_assignment_submissions ALTER format SET NOT NULL');
     }
 
+    if ($oldversion < 2006092100) {
+        table_column('assignment_submissions', 'comment', 'submissioncomment', 'text', '', '', '');
+    } 
+
 /// These lines ALWAYS need to be here at the end of this file.  Don't mess with them. :-)
     include_once("$CFG->dirroot/mod/assignment/lib.php");
     assignment_upgrade_submodules();
diff --git a/mod/assignment/db/postgres7.sql b/mod/assignment/db/postgres7.sql
index de2001e8db..3cb739ece3 100644
--- a/mod/assignment/db/postgres7.sql
+++ b/mod/assignment/db/postgres7.sql
@@ -42,7 +42,7 @@ CREATE TABLE prefix_assignment_submissions (
   data1 text NOT NULL default '',
   data2 text NOT NULL default '',
   grade integer NOT NULL default '0',
-  comment text NOT NULL default '',
+  submissioncomment text NOT NULL default '',
   format integer NOT NULL default '0',
   teacher integer NOT NULL default '0',
   timemarked integer NOT NULL default '0',
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index b27fcbae3d..621075c789 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -209,7 +209,7 @@ class assignment_base {
      * Display the feedback to the student
      *
      * This default method prints the teacher picture and name, date when marked,
-     * grade and teacher comment.
+     * grade and teacher submissioncomment.
      *
      * @param $submission object The submission object or NULL in which case it will be loaded
      */
@@ -257,7 +257,7 @@ class assignment_base {
         }
 
         echo '<div class="comment">';
-        echo format_text($submission->comment, $submission->format);
+        echo format_text($submission->submissioncomment, $submission->format);
         echo '</div>';
         echo '</tr>';
 
@@ -582,8 +582,8 @@ class assignment_base {
                 $grading    = false;
                 $commenting = false;
                 $col        = false;
-                if (isset($_POST['comment'])) {
-                    $col = 'comment';
+                if (isset($_POST['submissioncomment'])) {
+                    $col = 'submissioncomment';
                     $commenting = true;
                 }
                 if (isset($_POST['menu'])) {
@@ -591,7 +591,7 @@ class assignment_base {
                     $grading = true;
                 }
                 if (!$col) {
-                    //both comment and grade columns collapsed..
+                    //both submissioncomment and grade columns collapsed..
                     $this->display_submissions();            
                     break;
                 }
@@ -620,11 +620,11 @@ class assignment_base {
                         }
                     }
                     if ($commenting) {
-                        $commentvalue = trim($_POST['comment'][$id]);
-                        $updatedb = $updatedb || ($submission->comment != stripslashes($commentvalue));
-                        $submission->comment = $commentvalue;
+                        $commentvalue = trim($_POST['submissioncomment'][$id]);
+                        $updatedb = $updatedb || ($submission->submissioncomment != stripslashes($commentvalue));
+                        $submission->submissioncomment = $commentvalue;
                     } else {
-                        unset($submission->comment);  // Don't need to update this.
+                        unset($submission->submissioncomment);  // Don't need to update this.
                     }
 
                     $submission->teacher    = $USER->id;
@@ -632,7 +632,7 @@ class assignment_base {
                     $submission->timemarked = time();
 
                     //if it is not an update, we don't change the last modified time etc.
-                    //this will also not write into database if no comment and grade is entered.
+                    //this will also not write into database if no submissioncomment and grade is entered.
 
                     if ($updatedb){
                         if ($newsubmission) {
@@ -698,13 +698,13 @@ class assignment_base {
         
         /// Run some Javascript to try and update the parent page
         $output .= '<script type="text/javascript">'."\n<!--\n";
-        if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['comment'])) {
+        if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['submissioncomment'])) {
             if ($quickgrade){
-                $output.= 'opener.document.getElementById("comment['.$submission->userid.']").value="'
-                .trim($submission->comment).'";'."\n";
+                $output.= 'opener.document.getElementById("submissioncomment['.$submission->userid.']").value="'
+                .trim($submission->submissioncomment).'";'."\n";
              } else {
                 $output.= 'opener.document.getElementById("com'.$submission->userid.
-                '").innerHTML="'.shorten_text(trim(strip_tags($submission->comment)), 15)."\";\n";
+                '").innerHTML="'.shorten_text(trim(strip_tags($submission->submissioncomment)), 15)."\";\n";
             }
         }
 
@@ -777,7 +777,7 @@ class assignment_base {
     /**
      *  Display a single submission, ready for grading on a popup window
      *
-     * This default method prints the teacher info and comment box at the top and
+     * This default method prints the teacher info and submissioncomment box at the top and
      * the student info and submission at the bottom.
      * This method also fetches the necessary data in order to be able to
      * provide a "Next submission" button.
@@ -825,7 +825,7 @@ class assignment_base {
         }
 
         $select = 'SELECT u.id, u.id, u.firstname, u.lastname, u.picture,'.
-                  's.id AS submissionid, s.grade, s.comment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status ';
+                  's.id AS submissionid, s.grade, s.submissioncomment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status ';
         $sql = 'FROM '.$CFG->prefix.'user u '.
                'LEFT JOIN '.$CFG->prefix.'assignment_submissions s ON u.id = s.userid AND s.assignment = '.$this->assignment->id.' '.
                'WHERE u.id IN ('.implode(',', array_keys($users)).') ';
@@ -901,7 +901,7 @@ class assignment_base {
         $this->preprocess_submission($submission);
 
         echo '<br />';
-        print_textarea($this->usehtmleditor, 14, 58, 0, 0, 'comment', $submission->comment, $this->course->id);
+        print_textarea($this->usehtmleditor, 14, 58, 0, 0, 'submissioncomment', $submission->submissioncomment, $this->course->id);
 
         if ($this->usehtmleditor) { 
             echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
@@ -1018,7 +1018,7 @@ class assignment_base {
             $users = get_users_by_capability($context, 'mod/assignment:submit'); // everyone with this capability set to non-prohibit
         }
 
-        $tablecolumns = array('picture', 'fullname', 'grade', 'comment', 'timemodified', 'timemarked', 'status');
+        $tablecolumns = array('picture', 'fullname', 'grade', 'submissioncomment', 'timemodified', 'timemarked', 'status');
         $tableheaders = array('', get_string('fullname'), get_string('grade'), get_string('comment', 'assignment'), get_string('lastmodified').' ('.$course->student.')', get_string('lastmodified').' ('.$course->teacher.')', get_string('status'));
 
         require_once($CFG->libdir.'/tablelib.php');
@@ -1038,7 +1038,7 @@ class assignment_base {
         $table->column_class('picture', 'picture');
         $table->column_class('fullname', 'fullname');
         $table->column_class('grade', 'grade');
-        $table->column_class('comment', 'comment');
+        $table->column_class('submissioncomment', 'comment');
         $table->column_class('timemodified', 'timemodified');
         $table->column_class('timemarked', 'timemarked');
         $table->column_class('status', 'status');
@@ -1079,7 +1079,7 @@ class assignment_base {
             $sort = ' ORDER BY '.$sort;
         }
 
-        $select = 'SELECT u.id, u.id, u.firstname, u.lastname, u.picture, s.id AS submissionid, s.grade, s.comment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status ';
+        $select = 'SELECT u.id, u.id, u.firstname, u.lastname, u.picture, s.id AS submissionid, s.grade, s.submissioncomment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status ';
         $sql = 'FROM '.$CFG->prefix.'user u '.
                'LEFT JOIN '.$CFG->prefix.'assignment_submissions s ON u.id = s.userid AND s.assignment = '.$this->assignment->id.' '.
                'WHERE '.$where.'u.id IN ('.implode(',', array_keys($users)).') ';
@@ -1140,9 +1140,9 @@ class assignment_base {
                     }
                 ///Print Comment
                     if ($quickgrade){
-                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="comment['.$auser->id.']" id="comment['.$auser->id.']">'.($auser->comment).'</textarea></div>';
+                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="submissioncomment['.$auser->id.']" id="submissioncomment['.$auser->id.']">'.($auser->submissioncomment).'</textarea></div>';
                     } else {
-                        $comment = '<div id="com'.$auser->id.'">'.shorten_text(strip_tags($auser->comment),15).'</div>';
+                        $comment = '<div id="com'.$auser->id.'">'.shorten_text(strip_tags($auser->submissioncomment),15).'</div>';
                     }
                 } else {
                     $studentmodified = '<div id="ts'.$auser->id.'">&nbsp;</div>';
@@ -1155,7 +1155,7 @@ class assignment_base {
                         $grade = '<div id="g'.$auser->id.'">-</div>';
                     }
                     if ($quickgrade){
-                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="comment['.$auser->id.']" id="comment['.$auser->id.']">'.($auser->comment).'</textarea></div>';
+                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="submissioncomment['.$auser->id.']" id="submissioncomment['.$auser->id.']">'.($auser->submissioncomment).'</textarea></div>';
                     } else {
                         $comment = '<div id="com'.$auser->id.'">&nbsp;</div>';
                     }
@@ -1257,7 +1257,7 @@ class assignment_base {
         $submission = $this->get_submission($feedback->userid, true);  // Get or make one
 
         $submission->grade      = $feedback->grade;
-        $submission->comment    = $feedback->comment;
+        $submission->submissioncomment    = $feedback->submissioncomment;
         $submission->format     = $feedback->format;
         $submission->teacher    = $USER->id;
         $submission->mailed     = 0;       // Make sure mail goes out (again, even)
@@ -1325,7 +1325,7 @@ class assignment_base {
         $submission->data1        = '';
         $submission->data2        = '';
         $submission->grade        = -1;
-        $submission->comment      = '';
+        $submission->submissioncomment      = '';
         $submission->format       = 0;
         $submission->teacher      = 0;
         $submission->timemarked   = 0;
diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index 21562219e9..9ecd055d2a 100644
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -149,7 +149,11 @@
             $submission->data1 = backup_todb($sub_info['#']['DATA1']['0']['#']);
             $submission->data2 = backup_todb($sub_info['#']['DATA2']['0']['#']);
             $submission->grade = backup_todb($sub_info['#']['GRADE']['0']['#']);
-            $submission->comment = backup_todb($sub_info['#']['COMMENT']['0']['#']);
+            if (isset(backup_todb($sub_info['#']['COMMENT']['0']['#']))) {
+                $submission->submissioncomment = backup_todb($sub_info['#']['COMMENT']['0']['#']);
+            } else {
+                $submission->submissioncomment = backup_todb($sub_info['#']['SUBMISSIONCOMMENT']['0']['#']);
+            }
             $submission->format = backup_todb($sub_info['#']['FORMAT']['0']['#']);
             $submission->teacher = backup_todb($sub_info['#']['TEACHER']['0']['#']);
             $submission->timemarked = backup_todb($sub_info['#']['TIMEMARKED']['0']['#']);
diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index c51244848c..9f4c8a7cf2 100644
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -239,14 +239,14 @@ class assignment_online extends assignment_base {
     }
 
     function preprocess_submission(&$submission) {
-        if ($this->assignment->var1 && empty($submission->comment)) {  // comment inline
+        if ($this->assignment->var1 && empty($submission->submissioncomment)) {  // comment inline
             if ($this->usehtmleditor) {
                 // Convert to html, clean & copy student data to teacher
-                $submission->comment = format_text($submission->data1, $submission->data2);
+                $submission->submissioncomment = format_text($submission->data1, $submission->data2);
                 $submission->format  = FORMAT_HTML;
             } else {
                 // Copy student data to teacher
-                $submission->comment = $submission->data1;
+                $submission->submissioncomment = $submission->data1;
                 $submission->format  = $submission->data2;
             }
         }
diff --git a/mod/assignment/type/online/db/mysql.php b/mod/assignment/type/online/db/mysql.php
index daa0758961..9e046a5238 100644
--- a/mod/assignment/type/online/db/mysql.php
+++ b/mod/assignment/type/online/db/mysql.php
@@ -80,7 +80,7 @@ function assignment_online_upgrade($oldversion)  {
                         $submission->data1         = addslashes($entry->text);
                         $submission->data2         = $entry->format;
                         $submission->grade         = $entry->rating;
-                        $submission->comment       = addslashes($entry->comment);
+                        $submission->submissioncomment       = addslashes($entry->submissioncomment);
                         $submission->format        = FORMAT_MOODLE;
                         $submission->teacher       = $entry->teacher;
                         $submission->timemarked    = $entry->timemarked;
diff --git a/mod/assignment/type/online/db/postgres7.php b/mod/assignment/type/online/db/postgres7.php
index daa0758961..9e046a5238 100644
--- a/mod/assignment/type/online/db/postgres7.php
+++ b/mod/assignment/type/online/db/postgres7.php
@@ -80,7 +80,7 @@ function assignment_online_upgrade($oldversion)  {
                         $submission->data1         = addslashes($entry->text);
                         $submission->data2         = $entry->format;
                         $submission->grade         = $entry->rating;
-                        $submission->comment       = addslashes($entry->comment);
+                        $submission->submissioncomment       = addslashes($entry->submissioncomment);
                         $submission->format        = FORMAT_MOODLE;
                         $submission->teacher       = $entry->teacher;
                         $submission->timemarked    = $entry->timemarked;
diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index edb8970a8a..70833c0c67 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -223,7 +223,7 @@ class assignment_upload extends assignment_base {
                         }
                     }
                     
-                    $submission->comment = addslashes($submission->comment);
+                    $submission->submissioncomment = addslashes($submission->submissioncomment);
                     unset($submission->data1);  // Don't need to update this.
                     //unset($submission->data2);  // Don't need to update this.
                     if (update_record("assignment_submissions", $submission)) { 
@@ -492,7 +492,7 @@ class assignment_upload extends assignment_base {
        
         $newsubmission = $this->get_submission($feedback->userid, true);  // Get or make one
         $newsubmission->grade      = $feedback->grade;
-        $newsubmission->comment    = $feedback->comment;
+        $newsubmission->submissioncomment    = $feedback->submissioncomment;
         $newsubmission->format     = $feedback->format;
         $newsubmission->teacher    = $USER->id;
         $newsubmission->mailed     = 0;       // Make sure mail goes out (again, even)
@@ -558,8 +558,8 @@ class assignment_upload extends assignment_base {
                 $grading    = false;
                 $commenting = false;
                 $col        = false;
-                if (isset($_POST['comment'])) {
-                    $col = 'comment';
+                if (isset($_POST['submissioncomment'])) {
+                    $col = 'submissioncomment';
                     $commenting = true;
                 }
                 if (isset($_POST['menu'])) {
@@ -567,7 +567,7 @@ class assignment_upload extends assignment_base {
                     $grading = true;
                 }
                 if (!$col) {
-                    //both comment and grade columns collapsed..
+                    //both submissioncomment and grade columns collapsed..
                     $this->display_submissions();
                     break;
                 }
@@ -605,11 +605,11 @@ class assignment_upload extends assignment_base {
                          $submission->data1 = get_string("submissionstatusreturned", "assignment");
                     }
                     if ($commenting) {
-                        $commentvalue = trim($_POST['comment'][$id]);
-                        $updatedb = $updatedb || ($submission->comment != stripslashes($commentvalue));
-                        $submission->comment = $commentvalue;
+                        $commentvalue = trim($_POST['submissioncomment'][$id]);
+                        $updatedb = $updatedb || ($submission->submissioncomment != stripslashes($commentvalue));
+                        $submission->submissioncomment = $commentvalue;
                     } else {
-                        unset($submission->comment);  // Don't need to update this.
+                        unset($submission->submissioncomment);  // Don't need to update this.
                     }
 
                     $submission->teacher    = $USER->id;
@@ -617,7 +617,7 @@ class assignment_upload extends assignment_base {
                     $submission->timemarked = time();
 
                     //if it is not an update, we don't change the last modified time etc.
-                    //this will also not write into database if no comment and grade is entered.
+                    //this will also not write into database if no submissioncomment and grade is entered.
 
                     if ($updatedb) {
                         if ($newsubmission) {
@@ -678,13 +678,13 @@ class assignment_upload extends assignment_base {
 
         /// Run some Javascript to try and update the parent page
         echo '<script type="text/javascript">'."\n<!--\n";
-        if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['comment'])) {
+        if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['submissioncomment'])) {
             if ($quickgrade){
-                echo 'opener.document.getElementById("comment['.$submission->userid.']").value="'
-                .trim($submission->comment).'";'."\n";
+                echo 'opener.document.getElementById("submissioncomment['.$submission->userid.']").value="'
+                .trim($submission->submissioncomment).'";'."\n";
              } else {
                 echo 'opener.document.getElementById("com'.$submission->userid.
-                '").innerHTML="'.shorten_text(trim(strip_tags($submission->comment)), 15)."\";\n";
+                '").innerHTML="'.shorten_text(trim(strip_tags($submission->submissioncomment)), 15)."\";\n";
             }
         }
 
@@ -766,7 +766,7 @@ class assignment_upload extends assignment_base {
         }
 
         $select = 'SELECT u.id, u.id, u.firstname, u.lastname, u.picture,'.
-                  's.id AS submissionid, s.grade, s.comment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status ';
+                  's.id AS submissionid, s.grade, s.submissioncomment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status ';
         $sql = 'FROM '.$CFG->prefix.'user u '.
                'LEFT JOIN '.$CFG->prefix.'assignment_submissions s ON u.id = s.userid AND s.assignment = '.$this->assignment->id.' '.
                'WHERE u.id IN ('.implode(',', array_keys($users)).') AND s.data1 <> "Draft"  AND s.data1 <> ""';
@@ -851,7 +851,7 @@ class assignment_upload extends assignment_base {
         $this->preprocess_submission($submission);
 
         echo '<br />';
-        print_textarea($this->usehtmleditor, 14, 58, 0, 0, 'comment', $submission->comment, $this->course->id);
+        print_textarea($this->usehtmleditor, 14, 58, 0, 0, 'submissioncomment', $submission->submissioncomment, $this->course->id);
 
         if ($this->usehtmleditor) {
             echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
@@ -1109,7 +1109,7 @@ class assignment_upload extends assignment_base {
         print_header_simple(format_string($this->assignment->name,true), "", '<a href="index.php?id='.$course->id.'">'.$this->strassignments.'</a> -> <a href="view.php?a='.$this->assignment->id.'">'.format_string($this->assignment->name,true).'</a> -> '. $this->strsubmissions, '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm));
 
         //change column name to upload_status to allow ordering by upload_statuses
-        $tablecolumns = array('picture', 'fullname', 'grade', 'comment', 'timemodified', 'timemarked', 'upload_status');
+        $tablecolumns = array('picture', 'fullname', 'grade', 'submissioncomment', 'timemodified', 'timemarked', 'upload_status');
         $tableheaders = array('', get_string('fullname'), get_string('grade'), get_string('comment', 'assignment'), get_string('lastmodified').' ('.$course->student.')', get_string('lastmodified').' ('.$course->teacher.')', get_string('status'));
 
         require_once($CFG->libdir.'/tablelib.php');
@@ -1129,7 +1129,7 @@ class assignment_upload extends assignment_base {
         $table->column_class('picture', 'picture');
         $table->column_class('fullname', 'fullname');
         $table->column_class('grade', 'grade');
-        $table->column_class('comment', 'comment');
+        $table->column_class('submissioncomment', 'comment');
         $table->column_class('timemodified', 'timemodified');
         $table->column_class('timemarked', 'timemarked');
         $table->column_class('status', 'status');
@@ -1183,7 +1183,7 @@ class assignment_upload extends assignment_base {
         }
 
         //select has been modified. because we also need to get student id & assignment status == upload_status = {Draft, Submitted, Marked, Returned}
-        $select = 'SELECT u.id, u.id, u.firstname, u.lastname, u.picture, u.idnumber, s.id AS submissionid, s.grade, s.comment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status, s.data1 as upload_status ';
+        $select = 'SELECT u.id, u.id, u.firstname, u.lastname, u.picture, u.idnumber, s.id AS submissionid, s.grade, s.submissioncomment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status, s.data1 as upload_status ';
 
         // $select = 'SELECT u.id, u.id, u.firstname, u.lastname, u.picture, s.id AS submissionid, s.grade, s.comment, s.timemodified, s.timemarked, ((s.timemarked > 0) AND (s.timemarked >= s.timemodified)) AS status ';
         $sql = 'FROM '.$CFG->prefix.'user u '.
@@ -1254,9 +1254,9 @@ class assignment_upload extends assignment_base {
                     }
                     ///Print Comment
                     if ($quickgrade && $auser->upload_status != get_string("submissionstatusdraft", "assignment") &&  $auser->upload_status != get_string("submissionstatusblank", "assignment")) {
-                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="comment['.$auser->id.']" id="comment['.$auser->id.']">'.($auser->comment).'</textarea></div>';
+                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="submissioncomment['.$auser->id.']" id="submissioncomment['.$auser->id.']">'.($auser->submissioncomment).'</textarea></div>';
                     } else {
-                        $comment = '<div id="com'.$auser->id.'">'.shorten_text(strip_tags($auser->comment),15).'</div>';
+                        $comment = '<div id="com'.$auser->id.'">'.shorten_text(strip_tags($auser->submissioncomment),15).'</div>';
                     }
                 } else {
                     $studentmodified = '<div id="ts'.$auser->id.'">&nbsp;</div>';
@@ -1270,7 +1270,7 @@ class assignment_upload extends assignment_base {
                         $grade = '<div id="g'.$auser->id.'">-</div>';
                     }
                     if ($quickgrade && $auser->upload_status != get_string("submissionstatusdraft", "assignment") &&  $auser->upload_status != get_string("submissionstatusblank", "assignment") ){
-                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="comment['.$auser->id.']" id="comment['.$auser->id.']">'.($auser->comment).'</textarea></div>';
+                        $comment = '<div id="com'.$auser->id.'"><textarea tabindex="'.$tabindex++.'" name="submissioncomment['.$auser->id.']" id="submissioncomment['.$auser->id.']">'.($auser->submissioncomment).'</textarea></div>';
                     } else {
                         $comment = '<div id="com'.$auser->id.'">&nbsp;</div>';
                     }
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index 16db1df55c..45cda29620 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -122,7 +122,7 @@ class assignment_uploadsingle extends assignment_base {
                 if ($submission) {
                     $submission->timemodified = time();
                     $submission->numfiles     = 1;
-                    $submission->comment = addslashes($submission->comment);
+                    $submission->submissioncomment = addslashes($submission->submissioncomment);
                     unset($submission->data1);  // Don't need to update this.
                     unset($submission->data2);  // Don't need to update this.
                     if (update_record("assignment_submissions", $submission)) {
diff --git a/mod/assignment/version.php b/mod/assignment/version.php
index b2ac24a0ee..7e5557cb82 100644
--- a/mod/assignment/version.php
+++ b/mod/assignment/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2006091201;
+$module->version  = 2006092100;
 $module->requires = 2006080900;  // Requires this Moodle version
 $module->cron     = 60;