Index: moodle.svn/enrol/ldap/enrol.php
===================================================================
--- moodle.svn/enrol/ldap/enrol.php	(revision 3)
+++ moodle.svn/enrol/ldap/enrol.php	(revision 4)
@@ -222,6 +222,11 @@
                                           $this->enrol_localcoursefield,
                                           $idnumber );
                 if (!is_object($course_obj)) {
+ 		   if (empty($CFG->enrol_ldap_autocreate)) { // autocreation not allowed
+			print "[ENROL_LDAP] Course $idnumber does not exist, skipping\n";
+			continue; // next foreach course
+		}
+
                     // ok, now then let's create it!
                     print "Creating Course $idnumber...";
                     $newcourseid = $this->create_course($course, true); // we are skipping fix_course_sortorder()
Index: moodle.svn/lib/datalib.php
===================================================================
--- moodle.svn/lib/datalib.php	(revision 3)
+++ moodle.svn/lib/datalib.php	(revision 4)
@@ -1541,12 +1541,10 @@
 
     if (defined('MDL_PERFDB')) { global $PERF ; $PERF->dbqueries++; $PERF->logwrites++;};
 
-    if ($CFG->type = 'oci8po') {
-        if (empty($info)) {
-            $info = ' ';
-        }
-    }
+    $info = empty($info) ? sql_empty() : $info; // Use proper empties for each database
 
+    $url  = empty($url)  ? sql_empty() : $url;
+
     $result = $db->Execute('INSERT INTO '. $CFG->prefix .'log (time, userid, course, ip, module, cmid, action, url, info)
         VALUES (' . "'$timenow', '$userid', '$courseid', '$REMOTE_ADDR', '$module', '$cm', '$action', '$url', '$info')");
 
Index: moodle.svn/mod/scorm/datamodels/aicclib.php
===================================================================
--- moodle.svn/mod/scorm/datamodels/aicclib.php	(revision 3)
+++ moodle.svn/mod/scorm/datamodels/aicclib.php	(revision 4)
@@ -252,7 +252,9 @@
                     $sco->next = 0;
                     if ($oldscoid = scorm_array_search('identifier',$sco->identifier,$oldscoes)) {
                         $sco->id = $oldscoid;
-                        $id = update_record('scorm_scoes',$sco);
+                        if ($DB->update_record('scorm_scoes',$sco)) {
+	                    $id = $oldscoid;
+                         }                        
                         unset($oldscoes[$oldscoid]);
                     } else {
                         $id = insert_record('scorm_scoes',$sco);
Index: moodle.svn/mod/lesson/lesson.php
===================================================================
--- moodle.svn/mod/lesson/lesson.php	(revision 3)
+++ moodle.svn/mod/lesson/lesson.php	(revision 4)
@@ -29,7 +29,7 @@
     
     list($cm, $course, $lesson) = lesson_get_basics($id);
 
-    require_login($course->id);
+    require_login($course, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     
 /// Set up some general variables
Index: moodle.svn/backup/backuplib.php
===================================================================
--- moodle.svn/backup/backuplib.php	(revision 3)
+++ moodle.svn/backup/backuplib.php	(revision 4)
@@ -1126,7 +1126,6 @@
                 fwrite ($bf,full_tag("LASTLOGIN",4,false,$user->lastlogin));
                 fwrite ($bf,full_tag("CURRENTLOGIN",4,false,$user->currentlogin));
                 fwrite ($bf,full_tag("LASTIP",4,false,$user->lastip));
-                fwrite ($bf,full_tag("SECRET",4,false,$user->secret));
                 fwrite ($bf,full_tag("PICTURE",4,false,$user->picture));
                 fwrite ($bf,full_tag("URL",4,false,$user->url));
                 fwrite ($bf,full_tag("DESCRIPTION",4,false,$user->description));
Index: moodle.svn/backup/restorelib.php
===================================================================
--- moodle.svn/backup/restorelib.php	(revision 3)
+++ moodle.svn/backup/restorelib.php	(revision 4)
@@ -4670,9 +4670,6 @@
                         case "LASTIP": 
                             $this->info->tempuser->lastip = $this->getContents();
                             break;
-                        case "SECRET": 
-                            $this->info->tempuser->secret = $this->getContents();
-                            break;
                         case "PICTURE": 
                             $this->info->tempuser->picture = $this->getContents();
                             break;