MDL-19677 Upgrading sites that use $CFG->bloglevel == BLOG_GROUP_LEVEL or BLOG_COURSE...

diff --git a/admin/settings/security.php b/admin/settings/security.php
index 16a10062c30c8d587d2311244f53b33999a58afb..371d313f9ee255f657440d8ea6aa46da6655e661 100644 (file)
--- a/admin/settings/security.php
+++ b/admin/settings/security.php
@@ -53,6 +53,12 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
                                               'firstname' => get_string('firstname'))));
     $temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
     $temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
+                                                                                                                                              4 => get_string('siteblogs','blog'),
+                                                                                                                                              1 => get_string('personalblogs','blog'),
+                                                                                                                                              0 => get_string('disableblogs','blog'))));
+    $temp->add(new admin_setting_configcheckbox('usetags', get_string('usetags','admin'),get_string('configusetags', 'admin'),'1'));
+    $temp->add(new admin_setting_configcheckbox('useassoc', get_string('useassoc','admin'),get_string('configuseassoc', 'admin'),'1'));
     $temp->add(new admin_setting_configcheckbox('keeptagnamecase', get_string('keeptagnamecase','admin'),get_string('configkeeptagnamecase', 'admin'),'1'));
 
     $temp->add(new admin_setting_configcheckbox('profilesforenrolledusersonly', get_string('profilesforenrolledusersonly','admin'),get_string('configprofilesforenrolledusersonly', 'admin'),'1'));

diff --git a/version.php b/version.php
index cde020681f56d27b5cf1942c131742f665d9fa9b..c81af1d02a906ca58b45ea0fdc66570116c645be 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2009063000;  // YYYYMMDD   = date of the last version bump
+    $version = 2009070100;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20090701)';  // Human-friendly version name