From 6886a6fc5bf510a51d964a09785cd88cb3f0c4e8 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Fri, 1 Dec 2006 09:55:13 +0000
Subject: [PATCH] MDL-7234 Smilies don't load in HTML editor for some
 languages; backported from HEAD

---
 lib/moodlelib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index b2aeac3a6c7..95bc261f6b4 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -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
     }