Move error templates in another location

ohartl · Mar 4, 2016 · a0c88ff · a0c88ff
1 parent 79d1ba2
commit a0c88ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/include/php/classes/Router.php b/include/php/classes/Router.php
@@ -16,8 +16,8 @@ class Router
 	 * @var array
 	 */
 	private static $errorPages = array(
-		404 => 'include/php/pages/404.php',
-		403 => 'include/php/pages/not-allowed.php'
+		404 => 'include/php/template/error/not-found.php',
+		403 => 'include/php/template/error/not-allowed.php'
 	);
 
 
@@ -225,9 +225,16 @@ public static function loadAndBufferOutput($file, $variables = array())
 	 *
 	 * @return string
 	 */
-	public static function url($url)
+	public static function url($url = '')
 	{
-		return sprintf('%s/%s', rtrim(Config::get('base_url'), '/'), trim($url, '/'));
+		return rtrim(
+			sprintf(
+				'%s/%s',
+				rtrim(Config::get('base_url'), '/'),
+				trim($url, '/')
+			),
+			'/'
+		);
 	}
 
 

diff --git a/include/php/pages/not-allowed.php → include/php/template/error/not-allowed.php b/include/php/pages/not-allowed.php → include/php/template/error/not-allowed.php
diff --git a/include/php/pages/404.php → include/php/template/error/not-found.php b/include/php/pages/404.php → include/php/template/error/not-found.php