Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle

Conflicts: lib/db/upgrade.php version.php
2012-08-15 00:41:04 +02:00
parent 267c898bfd 6a2a055edc
commit 76b97631b0
22 changed files with 56 additions and 340 deletions
@@ -69,7 +69,7 @@ if ($action == 'edit') {
    $id = required_param('entryid', PARAM_INT);
 }

-if (empty($CFG->bloglevel)) {
+if (empty($CFG->enableblogs)) {
    print_error('blogdisable', 'blog');
 }