Merge pull request #22 from skipperbent/development

[BUGFIX] Fixed Exceptions due to route null value.
2026-06-26 04:59:14 +00:00 · 2015-10-30 02:28:40 +01:00 · 2015-10-30 02:27:44 +01:00
1 changed files with 2 additions and 2 deletions
@@ -253,7 +253,7 @@ class RouterBase {
            throw new \InvalidArgumentException('Invalid type for getParams. Must be array or null');
        }

-        if($controller === null && $parameters === null) {
+        if($controller === null && $parameters === null && $this->loadedRoute !== null) {
            return $this->processUrl($this->loadedRoute, null, $getParams);
        }

@@ -295,7 +295,7 @@ class RouterBase {
                $method = $tmp[1];
            }

-            if($controller === $c) {
+            if($controller === $c && $route !== null) {
                return $this->processUrl($route, $method, $parameters, $getParams);
            }
        }
Author	SHA1	Message	Date
Simon Sessingø	0df469184c	Merge pull request #22 from skipperbent/development [BUGFIX] Fixed Exceptions due to route null value.	2015-10-30 02:28:40 +01:00
Simon Sessingø	649ed28a91	[BUGFIX] Fixed Exceptions due to route null value.	2015-10-30 02:27:44 +01:00