Skip to content

Commit

Permalink
Prevented the catch all landing page route from catching urls to app/…
Browse files Browse the repository at this point in the history
…bundles/ and addons/ which prevented loading assets directly from those folders
  • Loading branch information
alanhartless committed Mar 11, 2015
1 parent e8f705b commit baf6ec6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
# When mod_rewrite is not available, we instruct a temporary redirect of
# the start page to the front controller explicitly so that the website
# and the generated links can still be used.
RedirectMatch 302 ^(?!/(index\.php|index_dev\.php|app|media|upgrade))(/(.*))$ /index.php$2
RedirectMatch 302 ^(?!/(index\.php|index_dev\.php|app|addons|media|upgrade))(/(.*))$ /index.php$2
# RedirectTemp cannot be used instead
</IfModule>
</IfModule>
2 changes: 1 addition & 1 deletion app/bundles/PageBundle/Config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
'path' => '/{slug}',
'controller' => 'MauticPageBundle:Public:index',
'requirements' => array(
'slug' => '^(?!(_(profiler|wdt)|css|images|js|favicon.ico)).+'
'slug' => '^(?!(_(profiler|wdt)|css|images|js|favicon.ico|apps/bundles/|addons/)).+'
)
),
)
Expand Down

0 comments on commit baf6ec6

Please sign in to comment.