--- /home/dan/moodle/moodle/lib/db/upgrade.php	2008-01-11 15:44:27.000000000 +0000
+++ upgrade.php	2008-01-13 15:00:55.000000000 +0000
@@ -1,4 +1,4 @@
-<?PHP  //$Id$
+<?PHP  //$Id: upgrade.php,v 1.154.2.14 2007/12/23 20:00:51 skodak Exp $
 
 // This file keeps track of upgrades to Moodle.
 //
@@ -2054,6 +2054,18 @@
     /// Launch create table for context_temp
         $result = $result && create_table($table);
 
+    /// attach all courses to a category to prevent breakage
+        $unorphansql = "UPDATE {$CFG->prefix}course c
+                        LEFT OUTER JOIN {$CFG->prefix}course_categories cc
+                        ON c.category = cc.id
+                        SET c.category = 
+                            (SELECT id FROM 
+                            {$CFG->prefix}course_categories 
+                            WHERE parent = 0 
+                            ORDER BY sortorder LIMIT 1)
+                        WHERE cc.id IS NULL AND c.id != ".SITEID;
+        execute_sql($unorphansql, true);
+
     /// make sure category depths, parents and paths are ok, categories from 1.5 may not be properly initialized (MDL-12585)
         upgrade_fix_category_depths();