Merge branch '48304-27' of git://github.com/samhemelryk/moodle into M…

…OODLE_27_STABLE
moodle · Nov 24, 2014 · 806aba0 · 806aba0
2 parents 0db7d1b + 57476f6
commit 806aba0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/tests/weblib_test.php b/lib/tests/weblib_test.php
@@ -285,6 +285,16 @@ public function test_compare_url() {
         $this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
         $this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS));
         $this->assertTrue($url1->compare($url2, URL_MATCH_EXACT));
+
+        $url1->set_anchor('test');
+        $this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
+        $this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS));
+        $this->assertFalse($url1->compare($url2, URL_MATCH_EXACT));
+
+        $url2->set_anchor('test');
+        $this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
+        $this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS));
+        $this->assertTrue($url1->compare($url2, URL_MATCH_EXACT));
     }
 
     public function test_out_as_local_url() {

diff --git a/lib/weblib.php b/lib/weblib.php
@@ -632,6 +632,10 @@ public function compare(moodle_url $url, $matchtype = URL_MATCH_EXACT) {
             }
         }
 
+        if ($url->anchor !== $this->anchor) {
+            return false;
+        }
+
         return true;
     }