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

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index c22aa7b45a131e974d6aee5ecb240111ccc04557..4d255b70b3046c852872481d3f62e7757e10634c 100644 (file)
--- 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
     }