@@ -271,7 +271,7 @@ |
||
271 | 271 | |
272 | 272 | Route::group( $conf, function() { |
273 | 273 | |
274 | - Route::match(['GET', 'POST'], '{path?}', [ |
|
274 | + Route::match( ['GET', 'POST'], '{path?}', [ |
|
275 | 275 | 'as' => 'aimeos_page', |
276 | 276 | 'uses' => '\Aimeos\Shop\Controller\PageController@indexAction' |
277 | 277 | ] )->where( ['locale' => '[a-z]{2}(\_[A-Z]{2})?', 'site' => '[A-Za-z0-9\.\-]+'] ); |
@@ -62,25 +62,25 @@ |
||
62 | 62 | 'adapter' => 'Standard', |
63 | 63 | 'tempdir' => storage_path( 'tmp' ), |
64 | 64 | 'basedir' => public_path(), |
65 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/'), |
|
65 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ), |
|
66 | 66 | ], |
67 | 67 | 'fs-media' => [ |
68 | 68 | 'adapter' => 'Standard', |
69 | 69 | 'tempdir' => storage_path( 'tmp' ), |
70 | 70 | 'basedir' => public_path( 'aimeos' ), |
71 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/aimeos', |
|
71 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/aimeos', |
|
72 | 72 | ], |
73 | 73 | 'fs-mimeicon' => [ |
74 | 74 | 'adapter' => 'Standard', |
75 | 75 | 'tempdir' => storage_path( 'tmp' ), |
76 | 76 | 'basedir' => public_path( 'vendor/shop/mimeicons' ), |
77 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/vendor/shop/mimeicons', |
|
77 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/vendor/shop/mimeicons', |
|
78 | 78 | ], |
79 | 79 | 'fs-theme' => [ |
80 | 80 | 'adapter' => 'Standard', |
81 | 81 | 'tempdir' => storage_path( 'tmp' ), |
82 | 82 | 'basedir' => public_path( 'vendor/shop/themes' ), |
83 | - 'baseurl' => rtrim(env('ASSET_URL', PHP_SAPI == 'cli' ? env('APP_URL') : ''), '/') . '/vendor/shop/themes', |
|
83 | + 'baseurl' => rtrim( env( 'ASSET_URL', PHP_SAPI == 'cli' ? env( 'APP_URL' ) : '' ), '/' ) . '/vendor/shop/themes', |
|
84 | 84 | ], |
85 | 85 | 'fs-admin' => [ |
86 | 86 | 'adapter' => 'Standard', |