From: skodak <skodak>
Date: Thu, 31 Jul 2008 09:41:12 +0000 (+0000)
Subject: MDL-15893 tinymce integration does not use session anymore, there is still problem... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=dfc5838ea1e9d7cae8b42d8905d7dc2323ab9e6d;p=moodle.git

MDL-15893 tinymce integration does not use session anymore, there is still problem with CSS (editor changes text size outside of it)
---

diff --git a/lib/editor/htmlEditor.class.php b/lib/editor/htmlEditor.class.php
index 1a3a2de8cc..e405f426e2 100644
--- a/lib/editor/htmlEditor.class.php
+++ b/lib/editor/htmlEditor.class.php
@@ -42,8 +42,10 @@ class htmlEditor {
         switch ($editor) {
 
             case 'tinymce':
+                $editorlanguage = substr(current_language(), 0, 2);
+                $direction = get_string('thisdirection');
                 $configuration[] = $CFG->httpswwwroot ."/lib/editor/tinymce/jscripts/tiny_mce/tiny_mce.js";
-                $configuration[] = $CFG->httpswwwroot ."/lib/editor/tinymce.js.php?course=". $courseid;
+                $configuration[] = $CFG->httpswwwroot ."/lib/editor/tinymce.js.php?course=$courseid&amp;editorlanguage=$editorlanguage&amp;direction=$direction";
                 $configured['tinymce'] = true;
                 break;
 
diff --git a/lib/editor/tinymce.js.php b/lib/editor/tinymce.js.php
index a50335c4e6..003ffbdf1a 100644
--- a/lib/editor/tinymce.js.php
+++ b/lib/editor/tinymce.js.php
@@ -1,10 +1,12 @@
 <?php
 
+define('NO_MOODLE_COOKIES', true);
+
 require_once('../../config.php');
 
 $courseid = optional_param('course', 0, PARAM_INT);
-$editorlanguage = substr(current_language(), 0, 2);
-$directionality = get_string('thisdirection');
+$editorlanguage = optional_param('editorlanguage', 'en', PARAM_ALPHA);
+$directionality = optional_param('direction', get_string('thisdirection'), PARAM_ALPHA);
 
 /*
  * This section configures the TinyMCE toolbar buttons on and off