MDL-7234 Smilies don't load in HTML editor for some languages

moodle · Dec 1, 2006 · 81f5d4a · 81f5d4a
1 parent 14bac76
commit 81f5d4a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -4693,7 +4693,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
     }