MDL-16438 fixed incomplete plugin centralisation, sorry; unfortunately install is...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 4c0fe9913cfe80984910b784dd1038a20f9757d8..43387e0169b937218d42610383f7cf9a7c8d2333 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6741,7 +6741,7 @@ function get_plugin_types($fullpaths=true) {
                       'portfolio'     => 'portfolio/type',
                       'qtype'         => 'question/type',
                       'qformat'       => 'question/format');
-/*
+
         $mods = get_plugin_list('mod');
         foreach ($mods as $mod => $moddir) {
             if (!$subplugins = plugin_supports('mod', $mod, FEATURE_MOD_SUBPLUGINS, false)) {
@@ -6751,9 +6751,9 @@ function get_plugin_types($fullpaths=true) {
                 $info[$subtype] = $dir;
             }
         }
-*/
+
         // do not include themes if in non-standard location
-        if ($CFG->themedir === $CFG->dirroot.'/theme') {
+        if (empty($CFG->themedir) or $CFG->themedir === $CFG->dirroot.'/theme') {
             $info['theme'] = 'theme';
         }
 
@@ -6786,7 +6786,7 @@ function get_plugin_list($plugintype, $fullpaths=true) {
     }
 
     if ($plugintype === 'mod') {
-        // mod is eán exception because we have to call this function from get_plugin_types()
+        // mod is an exception because we have to call this function from get_plugin_types()
         $fulldir = $CFG->dirroot.'/mod';
         $dir = $fullpaths ? $fulldir : 'mod';
 

diff --git a/mod/quiz/report/statistics/db/install.php b/mod/quiz/report/statistics/db/install.php
index aa193d21f13043ed1edc26802cf4f2290026d7ab..5d2ffd2e2da0f6158e1b71900f82fd2e6ef38ece 100644 (file)
--- a/mod/quiz/report/statistics/db/install.php
+++ b/mod/quiz/report/statistics/db/install.php
@@ -3,7 +3,7 @@
 // This file is executed right after the install.xml
 //
 
-function xmldb_quizreport_statistics_install() {
+function xmldb_quiz_statistics_install() {
     global $DB;
 
     $record = new object();