MDL-7234 Smilies don't load in HTML editor for some languages; backported from HEAD

2006-12-01 09:55:13 +00:00
parent 240e3cde63
commit 6886a6fc5b
1 changed files with 1 additions and 1 deletions
@@ -5174,7 +5174,7 @@ function get_list_of_pixnames($lang = '') {
    } else if (file_exists($CFG->dataroot .'/lang/'. $lang .'/pix.php')) {
        $path = $CFG->dataroot .'/lang/'. $lang .'/pix.php';

-    } else if ($parentlang = get_string('parentlanguage')) {
+    } else if ($parentlang = get_string('parentlanguage') and $parentlang != '[[parentlanguage]]') {
        return get_list_of_pixnames($parentlang); //return pixnames from parent language instead
    }