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

Fix issue with core/Core.php includes

Browse Source 
Fix PHP 5.5 compatibility issue
This commit is contained in:
Damian Mooyman 2016-09-08 16:31:02 +12:00
parent 8dd644d25d
commit 77d1677304
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Flysystem/ProtectedAssetAdapter.php
View File

@ -20,10 +20,10 @@ class ProtectedAssetAdapter extends AssetAdapter implements ProtectedAdapter {
private static $server_configuration = array( private static $server_configuration = array(
'apache' => array( 'apache' => array(
'.htaccess' => __CLASS__ . "_HTAccess" '.htaccess' => "SilverStripe\\Assets\\Flysystem\\ProtectedAssetAdapter_HTAccess"
), ),
'microsoft-iis' => array( 'microsoft-iis' => array(
'web.config' => __CLASS__ . "_WebConfig" 'web.config' => "SilverStripe\\Assets\\Flysystem\\ProtectedAssetAdapter_WebConfig"
) )
); );

4
Assets/Flysystem/PublicAssetAdapter.php
View File

@ -15,10 +15,10 @@ class PublicAssetAdapter extends AssetAdapter implements PublicAdapter {
*/ */
private static $server_configuration = array( private static $server_configuration = array(
'apache' => array( 'apache' => array(
'.htaccess' => __CLASS__ . "_HTAccess" '.htaccess' => "SilverStripe\\Assets\\Flysystem\\PublicAssetAdapter_HTAccess"
), ),
'microsoft-iis' => array( 'microsoft-iis' => array(
'web.config' => __CLASS__ . "_WebConfig" 'web.config' => "SilverStripe\\Assets\\Flysystem\\PublicAssetAdapter_WebConfig"
) )
); );

2
Dev/Install/install.php5
View File

@ -1432,7 +1432,7 @@ PHP
$this->statusMessage("Building database schema..."); $this->statusMessage("Building database schema...");
require_once 'core/Core.php'; require_once 'Core/Core.php';
// Build database // Build database
$con = new Controller(); $con = new Controller();

2
cli-script.php
View File

@ -72,7 +72,7 @@ else {
/** /**
* Include SilverStripe's core code * Include SilverStripe's core code
*/ */
require_once("core/Core.php"); require_once("Core/Core.php");
global $databaseConfig; global $databaseConfig;