Merge branch 'w10_MDL-31807_m22_cohort' of git://github.com/skodak/moodle into MOODLE_22_STABLE

2012-03-05 16:56:05 +13:00
parent 94cfcb36a5 0908a1a327
commit 7d6c1a19bb
1 changed files with 3 additions and 2 deletions
@@ -71,8 +71,9 @@ function cohort_add_cohort($cohort) {
 */
 function cohort_update_cohort($cohort) {
    global $DB;
-    if (isset($cohort->component) and empty($cohort->component)) {
-        $cohort->component = NULL;
+    if (property_exists($cohort, 'component') and empty($cohort->component)) {
+        // prevent NULLs
+        $cohort->component = '';
    }
    $cohort->timemodified = time();
    $DB->update_record('cohort', $cohort);