Discussions now store the last user to change them, as well as the

last time they were modified.   This isn't actually used yet but it
will be.

diff --git a/mod/forum/db/mysql.php b/mod/forum/db/mysql.php
index 9bdc25751a717b630914e505b6555f3c98b4bb04..c910bfb98d6a31bf22bea8fed5a91232a559bfe0 100644 (file)
--- a/mod/forum/db/mysql.php
+++ b/mod/forum/db/mysql.php
@@ -104,6 +104,10 @@ function forum_upgrade($oldversion) {
   if ($oldversion < 2004013000) {
       table_column("forum_posts", "mailed", "mailed", "tinyint", "2");
   }
+
+  if ($oldversion < 2004020600) {
+      table_column("forum_discussions", "", "usermodified", "integer", "10", "unsigned", "0", "", "timemodified");
+  }
   
   return true;
 

diff --git a/mod/forum/db/mysql.sql b/mod/forum/db/mysql.sql
index 26e373fde52c2e35840d7469c2a28ce910f6b2cc..c5c189ab11e0c0c04f0cb0a2e351b9acde8d99d1 100644 (file)
--- a/mod/forum/db/mysql.sql
+++ b/mod/forum/db/mysql.sql
@@ -36,6 +36,7 @@ CREATE TABLE prefix_forum_discussions (
   groupid int(10) unsigned NOT NULL default '0',
   assessed tinyint(1) NOT NULL default '1',
   timemodified int(10) unsigned NOT NULL default '0',
+  usermodified int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (id)
 ) COMMENT='Forums are composed of discussions';
 # --------------------------------------------------------

diff --git a/mod/forum/db/postgres7.php b/mod/forum/db/postgres7.php
index e01ac76a5b8f30089a413e87e0d9014e4f567098..5d9b69b5e6226b09902ff46f633e6d0e825301ac 100644 (file)
--- a/mod/forum/db/postgres7.php
+++ b/mod/forum/db/postgres7.php
@@ -43,6 +43,10 @@ function forum_upgrade($oldversion) {
       table_column("forum_discussions", "", "groupid", "integer", "10", "unsigned", "0", "", "userid");
   }
 
+  if ($oldversion < 2004020600) {
+      table_column("forum_discussions", "", "usermodified", "integer", "10", "unsigned", "0", "", "timemodified");
+  }
+
   return true;
 
 }

diff --git a/mod/forum/db/postgres7.sql b/mod/forum/db/postgres7.sql
index 12abc5cded8e82c5f79b34dfee3a7d888a7cca35..5cc0276feefa2443d813cb7ce197fcd69dc5612a 100644 (file)
--- a/mod/forum/db/postgres7.sql
+++ b/mod/forum/db/postgres7.sql
@@ -33,7 +33,8 @@ CREATE TABLE prefix_forum_discussions (
   userid integer NOT NULL default '0',
   groupid integer NOT NULL default '0',
   assessed integer NOT NULL default '1',
-  timemodified integer NOT NULL default '0'
+  timemodified integer NOT NULL default '0',
+  usermodified integer NOT NULL default '0'
 );
 # --------------------------------------------------------
 

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 7dd30a5dba5d8993210d7983d790a7b2cc46c387..8da15140faa74269803a9b0f2df564451f9e02fd 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -898,7 +898,8 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC",
         $postdata = "p.*";
     }
 
-    return get_records_sql("SELECT $postdata, d.timemodified, u.firstname, u.lastname, u.email, u.picture
+    return get_records_sql("SELECT $postdata, d.timemodified, d.usermodified, 
+                                   u.firstname, u.lastname, u.email, u.picture
                               FROM {$CFG->prefix}forum_discussions d, 
                                    {$CFG->prefix}forum_posts p,
                                    {$CFG->prefix}user u 
@@ -1774,6 +1775,7 @@ function forum_add_new_post($post) {
 
     // Update discussion modified date
     set_field("forum_discussions", "timemodified", $post->modified, "id", $post->discussion);
+    set_field("forum_discussions", "usermodified", $post->userid, "id", $post->discussion);
     
     return $post->id;
 }
@@ -1794,6 +1796,7 @@ function forum_update_post($post) {
 
     // Update discussion modified date
     set_field("forum_discussions", "timemodified", $post->modified, "id", $post->discussion);
+    set_field("forum_discussions", "usermodified", $post->userid, "id", $post->discussion);
 
     return update_record("forum_posts", $post);
 }
@@ -1835,6 +1838,7 @@ function forum_add_discussion($discussion) {
 
     $discussion->firstpost    = $post->id;
     $discussion->timemodified = $timenow;
+    $discussion->usermodified = $post->userid;
 
     if (! $discussion->id = insert_record("forum_discussions", $discussion) ) {
         delete_records("forum_posts", "id", $post->id);

diff --git a/mod/forum/version.php b/mod/forum/version.php
index 660a96ab37b5f1457f2eee677193c59c3ff63dca..9b7b46edc1fb71da786016e61381d753abf0be6e 100644 (file)
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004013101;
+$module->version  = 2004020600;
 $module->requires = 2004013101;  // Requires this Moodle version
 $module->cron     = 60;