mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into wip/laravel-6

Browse Source
This commit is contained in:
Luke Towers 2020-06-27 20:06:39 -06:00
commit dd8ceaa106
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/widgets/form/assets/js/october.form.js
View File

@ -220,7 +220,7 @@
var tabControl = $('[data-control=tab]', self.$el),
tabContainer = $('.nav-tabs', tabControl)
if (!tabControl.length || !$.contains(form.get(0), tabControl.get(0)))
if (!tabControl.length || !form || !form.length || !$.contains(form.get(0), tabControl.get(0)))
return
/*

3
server.php
View File

@ -11,8 +11,7 @@ $uri = urldecode(
// This file allows us to emulate Apache's "mod_rewrite" functionality from the
// built-in PHP web server. This provides a convenient way to test a Laravel
// application without having installed a "real" web server software here.
if ($uri !== '/' and file_exists(__DIR__.'/'.$uri))
{
if ($uri !== '/' and file_exists(__DIR__.'/'.$uri)) {
return false;
}
require_once __DIR__.'/index.php';