From: skodak <skodak>
Date: Fri, 1 Dec 2006 09:48:40 +0000 (+0000)
Subject: MDL-7234 Smilies don't load in HTML editor for some languages
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=81f5d4a102ea83a7796748a3ae6ccc9771b4a748;p=moodle.git

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

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index c22aa7b45a..4d255b70b3 100644
--- 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
     }