Improve the routes

nova-framework · Jul 13, 2019 · 536b9ce · 536b9ce
1 parent c33204a
commit 536b9ce
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/app/Routes/Assets.php b/app/Routes/Assets.php
@@ -14,9 +14,7 @@
 // Register the route for assets from Packages, Modules and Themes.
 $dispatcher->route('packages/(:any)/(:any)/(:all)', function (Request $request, $vendor, $package, $path) use ($dispatcher)
 {
-    $namespace = $vendor .'/' .$package;
-
-    if (is_null($packagePath = $dispatcher->getPackagePath($namespace))) {
+    if (is_null($packagePath = $dispatcher->getPackagePath($vendor, $package))) {
         return Response::make('File Not Found', 404);
     }
 
@@ -26,9 +24,7 @@
 // Register the route for assets from Vendor.
 $dispatcher->route('vendor/(:all)', function (Request $request, $path) use ($dispatcher)
 {
-    $paths = $dispatcher->getVendorPaths();
-
-    if (! Str::startsWith($path, $paths)) {
+    if (! Str::startsWith($path, $dispatcher->getVendorPaths())) {
         return Response::make('File Not Found', 404);
     }