fixed routing

127 · Nov 4, 2019 · 6b129c7 · 6b129c7
1 parent 8bccc68
commit 6b129c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/shpala/router.php b/lib/shpala/router.php
@@ -69,7 +69,8 @@ public function __construct(array &$config) {
 		static::set_root_action($_l_[1]);
 
 		//set up defaults by url
-		$request = $_SERVER['REQUEST_URI'];
+    $_params_pos = strpos($_SERVER['REQUEST_URI'], '?');
+    $request = !$_params_pos ? $_SERVER['REQUEST_URI'] : substr($_SERVER['REQUEST_URI'], 0, $_params_pos);
 		$url = explode('/', $request);
 		$this->params['controller'] = ($url[1]!=false) ? $url[1] : static::get_root_controller();
 		$this->params['action'] = (isset($url[2]) && $url[2]!=false) ? $url[2] : static::get_default_action();

diff --git a/lib/shpala/shpala.php b/lib/shpala/shpala.php
@@ -1,7 +1,7 @@
 <?php
 //TODO
 class Shpala {
-	public 	  $version = '1.1.3';
+	public 	  $version = '1.1.4';
 	protected $_config = [];
 	protected $_i18n = [];
 	protected $_router;