Merge branch 'release/1.4.1'

all-ride · Feb 15, 2018 · 449d2b3 · 449d2b3
2 parents 98e7726 + 8d91754
commit 449d2b3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Changelog
 
+## 1.4.1 - 2018-02-15
+### Updated
+- if an anchor comes through, ignore everything behind it
+
 ## 1.4.0 - 2017-04-21
-### 
+### Added
 - added $parse argument to getPath in Url class to replace the variables with their values
 
 ## 1.3.3 - 2017-02-08

diff --git a/src/ride/library/router/Route.php b/src/ride/library/router/Route.php
@@ -150,6 +150,12 @@ protected function setPath($path) {
             throw new RouterException('Could not set the path of the route : path is empty or not a string.');
         }
 
+        // if an anchor comes through, ignore everything behind it
+        $positionAnchor = strpos($path, '#');
+        if ($positionAnchor !== false) {
+            $path = substr($path, 0, $positionAnchor);
+        }
+
         $regexHttpSegment = '(([a-zA-Z0-9]|[$+_.-]|%|[!*\'(),])|(%[0-9A-Fa-f][0-9A-Fa-f])|[;:@&=])*';
         $regexHttpPath = '/^' . $regexHttpSegment . '(\\/' . $regexHttpSegment . ')*$/';
 

diff --git a/test/src/ride/library/router/RouteTest.php b/test/src/ride/library/router/RouteTest.php
@@ -38,6 +38,7 @@ public function providerConstruct() {
             array('/path', 'path'),
             array('///admin', '///admin'),
             array('/', '/'),
+            array('/path/to', '/path/to#anchor'),
         );
     }