Merge branch 'MDL-27116-themedir-config' of git://github.com/mudrd8mz/moodle

2011-05-02 14:16:13 +08:00
parent 598a9f7726 3dd1d7e701
commit 0af90dca01
1 changed files with 3 additions and 0 deletions
@@ -1035,6 +1035,9 @@ class theme_config {
        if (file_exists("$CFG->dirroot/theme/$themename/config.php")) {
            $dir = "$CFG->dirroot/theme/$themename";

+        } else if (!empty($CFG->themedir) and file_exists("$CFG->themedir/$themename/config.php")) {
+            $dir = "$CFG->themedir/$themename";
+
        } else {
            return null;
        }