tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix incorrect installer base tag generation (#8018)

Browse Source 
Fixes #7926
This commit is contained in:
Damian Mooyman 2018-04-24 10:53:08 +12:00 committed by Aaron Carlino
parent 73d31d4797
commit b07e13d2f8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Dev/Install/config-form.html
View File

@ -5,7 +5,7 @@
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head> <head>
<title>SilverStripe CMS / Framework Installation</title> <title>SilverStripe CMS / Framework Installation</title>
<base href="<?php echo htmlentities($base); ?>/" /> <base href="<?php echo htmlentities($base); ?>" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<script type="application/javascript" src="//code.jquery.com/jquery-1.7.2.min.js"></script> <script type="application/javascript" src="//code.jquery.com/jquery-1.7.2.min.js"></script>
<script type="application/javascript" src="<?=$clientPath; ?>/js/install.js"></script> <script type="application/javascript" src="<?=$clientPath; ?>/js/install.js"></script>

2
src/Dev/Install/install5.php
View File

@ -105,7 +105,7 @@ if ($installFromCli && ($req->hasErrors() || $dbReq->hasErrors())) {
} }
// Path to client resources (copied through silverstripe/vendor-plugin) // Path to client resources (copied through silverstripe/vendor-plugin)
$base = BASE_URL; $base = rtrim(BASE_URL, '/') . '/';
$clientPath = PUBLIC_DIR $clientPath = PUBLIC_DIR
? 'resources/vendor/silverstripe/framework/src/Dev/Install/client' ? 'resources/vendor/silverstripe/framework/src/Dev/Install/client'
: 'resources/silverstripe/framework/src/Dev/Install/client'; : 'resources/silverstripe/framework/src/Dev/Install/client';