FIxes bug 1669 and some defunct resource types

diff --git a/mod/resource/db/mysql.php b/mod/resource/db/mysql.php
index 81e446b8c38ed7fb068e2131057f9d0f7275c332..9ad0cb0d42719f13d9d6a33e790b4a33f846f01b 100644 (file)
--- a/mod/resource/db/mysql.php
+++ b/mod/resource/db/mysql.php
@@ -48,7 +48,10 @@ function resource_upgrade($oldversion) {
         modify_database("", "UPDATE prefix_resource SET type='directory' WHERE type='9';");
     }
 
-    
+    if ($oldversion < 2004072600) {
+        modify_database("", "UPDATE prefix_resource SET type='file' WHERE type='url';");
+        modify_database("", "UPDATE prefix_resource SET type='file' WHERE type='program';");
+    }
     
     return true;
 }

diff --git a/mod/resource/db/postgres7.php b/mod/resource/db/postgres7.php
index cc7c19c80a47f79bc8136191df015f1268adc5d0..3c94fb93fa95bfb05e3a750863f828de58f8f8ec 100644 (file)
--- a/mod/resource/db/postgres7.php
+++ b/mod/resource/db/postgres7.php
@@ -41,6 +41,11 @@ function resource_upgrade($oldversion) {
         modify_database("", "UPDATE prefix_resource SET type='text', options='3' WHERE type='8';");
         modify_database("", "UPDATE prefix_resource SET type='directory' WHERE type='9';");
     }
+
+    if ($oldversion < 2004072600) {
+        modify_database("", "UPDATE prefix_resource SET type='file' WHERE type='url';");
+        modify_database("", "UPDATE prefix_resource SET type='file' WHERE type='program';");
+    }
     
     return true;
 }

diff --git a/mod/resource/version.php b/mod/resource/version.php
index b9c945d7b7f63e876d506234b02575bf9450d97f..b7706bea8bd8e6767b6318697e4eac72b266245f 100644 (file)
--- a/mod/resource/version.php
+++ b/mod/resource/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004071303;
+$module->version  = 2004072600;
 $module->requires = 2004052501;  // Requires this Moodle version
 $module->cron     = 0;