Fix a couple of issues for PHP 7.0

2015-10-03 21:44:26 -04:00
parent c9e3178720
commit 92cf7f4df6
2 changed files with 4 additions and 3 deletions
--- a/app/Core/Router.php
+++ b/app/Core/Router.php
@@ -80,7 +80,7 @@ class Router extends Base
            $path = substr($path, 0, - strlen($query_string) - 1);
        }

-        if ($path{0} === '/') {
+        if (! empty($path) && $path{0} === '/') {
            $path = substr($path, 1);
        }

@@ -218,7 +218,6 @@ class Router extends Base
            list($this->controller, $this->action) = $this->findRoute($this->getPath($uri, $query_string)); // TODO: add plugin for routes
            $plugin = '';
        }
-
        $class = empty($plugin) ? '\Controller\\'.ucfirst($this->controller) : '\Plugin\\'.ucfirst($plugin).'\Controller\\'.ucfirst($this->controller);

        $instance = new $class($this->container);