Make sure the update happens (some of this new code is actually really

old and sort of got bypassed)

diff --git a/mod/survey/db/mysql.php b/mod/survey/db/mysql.php
index 48df9e725d8158ff80d2360bfb8dc517421ec889..8d940bc2ec15c6584b0cd9639089d310337dda43 100644 (file)
--- a/mod/survey/db/mysql.php
+++ b/mod/survey/db/mysql.php
@@ -158,7 +158,7 @@ function survey_upgrade($oldversion) {
         execute_sql("ALTER TABLE `survey_answers` CHANGE `user` `userid` INT(10) UNSIGNED DEFAULT '0' NOT NULL ");
     }
 
-    if ($oldversion < 2003051502) {
+    if ($oldversion < 2004021601) {
         execute_sql("INSERT INTO `{$CFG->prefix}survey` (`id`, `course`, `template`, `days`, `timecreated`, `timemodified`, `name`, `intro`, `questions`) VALUES (5, 0, 0, 0, 985017600, 985017600, 'ciqname', 'ciqintro', '69,70,71,72,73')");
         execute_sql("INSERT INTO `{$CFG->prefix}survey_questions` (`id`, `text`, `shorttext`, `multi`, `intro`, `type`, `options`) VALUES (69, 'ciq1', 'ciq1short', '', '', 0, '')");
         execute_sql("INSERT INTO `{$CFG->prefix}survey_questions` (`id`, `text`, `shorttext`, `multi`, `intro`, `type`, `options`) VALUES (70, 'ciq2', 'ciq2short', '', '', 0, '')");

diff --git a/mod/survey/db/postgres7.php b/mod/survey/db/postgres7.php
index eaab3078e1281e413ad9801e076209d6191c024a..a9f302af0c84aabef914fcb788055f9659af3053 100644 (file)
--- a/mod/survey/db/postgres7.php
+++ b/mod/survey/db/postgres7.php
@@ -6,7 +6,7 @@ function survey_upgrade($oldversion) {
 
     global $CFG;
 
-    if ($oldversion < 2003051501) {
+    if ($oldversion < 2004021601) {
         modify_database("", "INSERT INTO `prefix_survey` (`id`, `course`, `template`, `days`, `timecreated`, `timemodified`, `name`, `intro`, `questions`) VALUES (5, 0, 0, 0, 985017600, 985017600, 'ciqname', 'ciqintro', '69,70,71,72,73')");
         modify_database("", "INSERT INTO `prefix_survey_questions` (`id`, `text`, `shorttext`, `multi`, `intro`, `type`, `options`) VALUES (69, 'ciq1', 'ciq1short', '', '', 0, '')");
         modify_database("", "INSERT INTO `prefix_survey_questions` (`id`, `text`, `shorttext`, `multi`, `intro`, `type`, `options`) VALUES (70, 'ciq2', 'ciq2short', '', '', 0, '')");

diff --git a/mod/survey/version.php b/mod/survey/version.php
index 5e80d3b1541654e321f167086a59223b0160c51c..4686ffb0c922ef47dd80541bc9b62d66e962ae30 100644 (file)
--- a/mod/survey/version.php
+++ b/mod/survey/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004021600;
+$module->version  = 2004021601;
 $module->requires = 2004013101;  // Requires this Moodle version
 $module->cron     = 0;