Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-8592: Get spellchecking to work over https (backport from 1.9)

  • Loading branch information...
commit ae4b11cbfd2625ada92f6d4a61835e9f306bff4c 1 parent f452e87
scyrma authored
View
10 lib/editor/htmlarea/htmlarea.class.php
@@ -344,8 +344,8 @@ function print_speller_code ($usehtmleditor=false) {
echo "\n".'<script language="javascript" type="text/javascript">'."\n";
echo 'function openSpellChecker() {'."\n";
echo "\tvar speller = new spellChecker();\n";
- echo "\tspeller.popUpUrl = \"" . $this->cfg->wwwroot ."/lib/speller/spellchecker.html\";\n";
- echo "\tspeller.spellCheckScript = \"". $this->cfg->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+ echo "\tspeller.popUpUrl = \"" . $this->cfg->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+ echo "\tspeller.spellCheckScript = \"". $this->cfg->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
echo "\tspeller.spellCheckAll();\n";
echo '}'."\n";
echo '</script>'."\n";
@@ -353,8 +353,8 @@ function print_speller_code ($usehtmleditor=false) {
echo "\n\tfunction spellClickHandler(editor, buttonId) {\n";
echo "\t\teditor._textArea.value = editor.getHTML();\n";
echo "\t\tvar speller = new spellChecker( editor._textArea );\n";
- echo "\t\tspeller.popUpUrl = \"" . $this->cfg->wwwroot ."/lib/speller/spellchecker.html\";\n";
- echo "\t\tspeller.spellCheckScript = \"". $this->cfg->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+ echo "\t\tspeller.popUpUrl = \"" . $this->cfg->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+ echo "\t\tspeller.spellCheckScript = \"". $this->cfg->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
echo "\t\tspeller._moogle_edit=1;\n";
echo "\t\tspeller._editor=editor;\n";
echo "\t\tspeller.openChecker();\n\t";
@@ -363,4 +363,4 @@ function print_speller_code ($usehtmleditor=false) {
}
}
-?>
+?>
View
6 lib/speller/lib.php
@@ -4,8 +4,8 @@ function speller_enable (&$CFG) {
echo "function spellClickHandler(editor, buttonId) {\n";
echo "\teditor._textArea.value = editor.getHTML();\n";
echo "\tvar speller = new spellChecker( editor._textArea );\n";
- echo "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."/lib/speller/spellchecker.html\";\n";
- echo "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."/lib/speller/server-scripts/spellchecker.php?id=$courseid\";\n";
+ echo "\tspeller.popUpUrl = \"" . $CFG->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+ echo "\tspeller.spellCheckScript = \"". $CFG->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php?id=$courseid\";\n";
echo "\tspeller._moogle_edit=1;\n";
echo "\tspeller._editor=editor;\n";
echo "\tspeller.openChecker();\n";
@@ -14,4 +14,4 @@ function speller_enable (&$CFG) {
echo "config.toolbar.push([\"spell-check\"]);\n";
}
-?>
+?>
View
8 lib/weblib.php
@@ -4655,8 +4655,8 @@ function print_speller_code ($usehtmleditor=false, $return=false) {
$str .= "\n".'<script language="javascript" type="text/javascript">'."\n";
$str .= 'function openSpellChecker() {'."\n";
$str .= "\tvar speller = new spellChecker();\n";
- $str .= "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."/lib/speller/spellchecker.html\";\n";
- $str .= "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+ $str .= "\tspeller.popUpUrl = \"" . $CFG->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+ $str .= "\tspeller.spellCheckScript = \"". $CFG->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
$str .= "\tspeller.spellCheckAll();\n";
$str .= '}'."\n";
$str .= '</script>'."\n";
@@ -4664,8 +4664,8 @@ function print_speller_code ($usehtmleditor=false, $return=false) {
$str .= "\nfunction spellClickHandler(editor, buttonId) {\n";
$str .= "\teditor._textArea.value = editor.getHTML();\n";
$str .= "\tvar speller = new spellChecker( editor._textArea );\n";
- $str .= "\tspeller.popUpUrl = \"" . $CFG->wwwroot ."/lib/speller/spellchecker.html\";\n";
- $str .= "\tspeller.spellCheckScript = \"". $CFG->wwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
+ $str .= "\tspeller.popUpUrl = \"" . $CFG->httpswwwroot ."/lib/speller/spellchecker.html\";\n";
+ $str .= "\tspeller.spellCheckScript = \"". $CFG->httpswwwroot ."/lib/speller/server-scripts/spellchecker.php\";\n";
$str .= "\tspeller._moogle_edit=1;\n";
$str .= "\tspeller._editor=editor;\n";
$str .= "\tspeller.openChecker();\n";
Please sign in to comment.
Something went wrong with that request. Please try again.