From d830d4601d732e1d9f5572b4554c1ebec1d86660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 12 Apr 2016 14:36:07 +0200
Subject: [PATCH] MDL-52263 libraries: Add test cases to external_format_text
 options

---
 lib/externallib.php            |  2 +-
 lib/tests/externallib_test.php | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/externallib.php b/lib/externallib.php
index 019ddd26175..6c52c811bdf 100644
--- a/lib/externallib.php
+++ b/lib/externallib.php
@@ -836,7 +836,7 @@ function external_format_text($text, $textformat, $contextid, $component, $filea
         // If context is passed in options, check that is the same to show a debug message.
         if (isset($options['context'])) {
             if ((is_object($options['context']) && $options['context']->id != $contextid)
-                    || $options['context'] != $contextid) {
+                    || (!is_object($options['context']) && $options['context'] != $contextid)) {
                 debugging('Different contexts found in external_format_text parameters. $options[\'context\'] not allowed.
                     Using $contextid parameter...', DEBUG_DEVELOPER);
             }
diff --git a/lib/tests/externallib_test.php b/lib/tests/externallib_test.php
index f67a1205c60..14d9164b011 100644
--- a/lib/tests/externallib_test.php
+++ b/lib/tests/externallib_test.php
@@ -96,6 +96,40 @@ class core_externallib_testcase extends advanced_testcase {
 </span></span>', FORMAT_HTML);
         $this->assertSame(external_format_text($test, $testformat, $context->id, 'core', '', 0), $correct);
 
+        $test = '<p><a id="test"></a><a href="#test">Text</a></p>';
+        $testformat = FORMAT_HTML;
+        $correct = array($test, FORMAT_HTML);
+        $options = array('allowid' => true);
+        $this->assertSame(external_format_text($test, $testformat, $context->id, 'core', '', 0, $options), $correct);
+
+        $test = '<p><a id="test"></a><a href="#test">Text</a></p>';
+        $testformat = FORMAT_HTML;
+        $correct = array('<p><a></a><a href="#test">Text</a></p>', FORMAT_HTML);
+        $options = new StdClass();
+        $options->allowid = false;
+        $this->assertSame(external_format_text($test, $testformat, $context->id, 'core', '', 0, $options), $correct);
+
+        $test = '<p><a id="test"></a><a href="#test">Text</a></p>'."\n".'Newline';
+        $testformat = FORMAT_MOODLE;
+        $correct = array('<p><a id="test"></a><a href="#test">Text</a></p> Newline', FORMAT_HTML);
+        $options = new StdClass();
+        $options->newlines = false;
+        $this->assertSame(external_format_text($test, $testformat, $context->id, 'core', '', 0, $options), $correct);
+
+        $test = '<p><a id="test"></a><a href="#test">Text</a></p>';
+        $testformat = FORMAT_MOODLE;
+        $correct = array('<div class="text_to_html">'.$test.'</div>', FORMAT_HTML);
+        $options = new StdClass();
+        $options->para = true;
+        $this->assertSame(external_format_text($test, $testformat, $context->id, 'core', '', 0, $options), $correct);
+
+        $test = '<p><a id="test"></a><a href="#test">Text</a></p>';
+        $testformat = FORMAT_MOODLE;
+        $correct = array($test, FORMAT_HTML);
+        $options = new StdClass();
+        $options->context = $context;
+        $this->assertSame(external_format_text($test, $testformat, $context->id, 'core', '', 0, $options), $correct);
+
         $settings->set_raw($currentraw);
         $settings->set_filter($currentfilter);
     }