From d4156e80965cd16b3650ea9498d51a3377a5d6fb Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 12 Jul 2005 13:12:24 +0000
Subject: [PATCH] unset unmodified text fields SC#140 + popup fix; merged from
 MOODLE_15_STABLE

---
 mod/assignment/lib.php                                | 10 ++++++----
 mod/assignment/type/online/assignment.class.php       |  1 +
 mod/assignment/type/uploadsingle/assignment.class.php |  7 ++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 6fef4f7912a..98dd5e50633 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -851,6 +851,9 @@ class assignment_base {
         $newsubmission->mailed     = 0;       // Make sure mail goes out (again, even)
         $newsubmission->timemarked = time();
 
+        unset($newsubmission->data1);  // Don't need to update this.
+        unset($newsubmission->data2);  // Don't need to update this.
+
         if (empty($submission->timemodified)) {   // eg for offline assignments
             $newsubmission->timemodified = time();
         }
@@ -1030,14 +1033,13 @@ class assignment_base {
                     require_once($CFG->libdir.'/filelib.php');
                     $icon = mimeinfo('icon', $file);
                     if ($CFG->slasharguments) {
-                        $ffurl = "file.php/$filearea/$file";
+                        $ffurl = "$CFG->wwwroot/file.php/$filearea/$file";
                     } else {
-                        $ffurl = "file.php?file=/$filearea/$file";
+                        $ffurl = "$CFG->wwwroot/file.php?file=/$filearea/$file";
                     }
     
                     $output = '<img align="middle" src="'.$CFG->pixpath.'/f/'.$icon.'" height="16" width="16" alt="'.$icon.'" />'.
-                              link_to_popup_window ('/'.$ffurl, 'file'.$key, $file, 450, 580, $file, 'none', true).
-                             '<br />';
+                              '<a href="'.$ffurl.'" >'.$file.'</a><br />';
                 }
             }
         }
diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index 3b5ba1d3eac..31d3eb7f769 100644
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -181,6 +181,7 @@ class assignment_online extends assignment_base {
         $newsubmission->timemarked = time();
 
         unset($newsubmission->data1);  // Don't need to update this.
+        unset($newsubmission->data2);  // Don't need to update this.
 
         if (! update_record('assignment_submissions', $newsubmission)) {
             return false;
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index ad6e2c3fbff..ce4c833b7a9 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -85,6 +85,8 @@ class assignment_uploadsingle extends assignment_base {
                     $submission->timemodified = time();
                     $submission->numfiles     = 1;
                     $submission->comment = addslashes($submission->comment);
+                    unset($submission->data1);  // Don't need to update this.
+                    unset($submission->data2);  // Don't need to update this.
                     if (update_record("assignment_submissions", $submission)) {
                         $this->email_teachers($submission);
                         print_heading(get_string('uploadedfile'));
@@ -140,7 +142,10 @@ class assignment_uploadsingle extends assignment_base {
         $newsubmission->teacher    = $USER->id;
         $newsubmission->mailed     = 0;       // Make sure mail goes out (again, even)
         $newsubmission->timemarked = time();
-        
+
+        unset($newsubmission->data1);  // Don't need to update this.
+        unset($newsubmission->data2);  // Don't need to update this.
+
         if (! update_record('assignment_submissions', $newsubmission)) {
             return false;
         }