diff --git a/bootstrap/start.php b/bootstrap/start.php index 435a28a93..37b7e7d9a 100644 --- a/bootstrap/start.php +++ b/bootstrap/start.php @@ -67,8 +67,8 @@ if (!isset($unitTesting) || !$unitTesting) { header('Cache-Control: pre-check=0, post-check=0, max-age=0, max-stale = 0', false); // HTTP/1.1 header('Pragma: public'); header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past - header('Expires: 0', false); - header('Last-Modified: '.gmdate('D, d M Y H:i:s') . ' GMT'); + header('Expires: 0', false); + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Pragma: no-cache'); } diff --git a/modules/backend/routes.php b/modules/backend/routes.php index 7b6e74fbb..708689594 100644 --- a/modules/backend/routes.php +++ b/modules/backend/routes.php @@ -1,12 +1,20 @@ Config::get('cms.backendUri', 'backend')], function() { + Route::any('{slug}', 'Backend\Classes\BackendController@run')->where('slug', '(.*)?'); + }); + + /* + * Entry point + */ + Route::any(Config::get('cms.backendUri', 'backend'), 'Backend\Classes\BackendController@run'); -Route::group(['prefix' => Config::get('cms.backendUri', 'backend')], function() { - Route::any('{slug}', 'Backend\Classes\BackendController@run')->where('slug', '(.*)?'); }); - - -Route::any(Config::get('cms.backendUri', 'backend'), 'Backend\Classes\BackendController@run'); \ No newline at end of file diff --git a/modules/cms/routes.php b/modules/cms/routes.php index d49dfe7e9..45a8295ff 100644 --- a/modules/cms/routes.php +++ b/modules/cms/routes.php @@ -1,12 +1,19 @@ where('slug', '(.*)?'); \ No newline at end of file + /* + * Combine JavaScript and StyleSheet assets + */ + Route::any('combine/{file}', 'Cms\Classes\Controller@combine'); + + /* + * The CMS module intercepts all URLs that were not + * handled by the back-end modules. + */ + Route::any('{slug}', 'Cms\Classes\Controller@run')->where('slug', '(.*)?'); + +});