From dc0288a665bfb0b212480322d2cdaaff6d3dfc0e Mon Sep 17 00:00:00 2001 From: Inaki Date: Tue, 20 Jul 2010 10:25:02 +0000 Subject: [PATCH] enrol/ldap: MDL-23424 don't upgrade $CFG->enrol_ldap_version if it's not defined --- enrol/ldap/db/install.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/enrol/ldap/db/install.php b/enrol/ldap/db/install.php index b0010787cf8..dc95b0a8361 100644 --- a/enrol/ldap/db/install.php +++ b/enrol/ldap/db/install.php @@ -61,8 +61,10 @@ function xmldb_enrol_ldap_install() { // Now migrate the real plugin settings. 'enrol_ldap_version' is the only // setting that cannot be migrated like the rest, as it clashes with the // plugin version number once we strip the 'enrol_ldap_' prefix. - set_config('ldap_version', $CFG->enrol_ldap_version, 'enrol_ldap'); - unset_config('enrol_ldap_version'); + if (isset($CFG->enrol_ldap_version)) { + set_config('ldap_version', $CFG->enrol_ldap_version, 'enrol_ldap'); + unset_config('enrol_ldap_version'); + } $settings = array ('host_url', 'bind_dn', 'bind_pw', 'objectclass', 'course_idnumber', 'course_shortname', 'course_fullname', 'course_summary',