Merge branch 'w51_MDL-37323_m24_dlgstrings' of git://github.com/skoda…

…k/moodle into MOODLE_24_STABLE
moodle · Jan 8, 2013 · 793c431 · 793c431
2 parents 2e25f80 + 6606784
commit 793c431
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/editor/tinymce/all_strings.php b/lib/editor/tinymce/all_strings.php
@@ -72,7 +72,7 @@
     $componentstrings = get_string_manager()->load_component_strings(
             'tinymce_' . $component, $lang);
     foreach ($componentstrings as $key => $value) {
-        if (strpos($key, "$component:") !== 0) {
+        if (strpos($key, "$component:") !== 0 and strpos($key, $component.'_dlg:') !== 0) {
             // Ignore normal lang strings.
             continue;
         }