tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-19 16:06:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48 from simonwelsh/2.4

Browse Source 
PHP5.4 Support
This commit is contained in:
Sam Minnée 2011-08-25 03:11:24 -07:00
commit cc59effef6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Core.php
View File

@ -38,7 +38,7 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// ENVIRONMENT CONFIG // ENVIRONMENT CONFIG
if(defined('E_DEPRECATED')) error_reporting(E_ALL ^ E_DEPRECATED); if(defined('E_DEPRECATED')) error_reporting(E_ALL & ~(E_DEPRECATED | E_STRICT));
else error_reporting(E_ALL); else error_reporting(E_ALL);
/* /*
* This is for versions of PHP prior to version 5.2 * This is for versions of PHP prior to version 5.2

3
core/ManifestBuilder.php
View File

@ -195,9 +195,8 @@ class ManifestBuilder {
// locate and include the exclude files // locate and include the exclude files
$topLevel = scandir($baseDir); $topLevel = scandir($baseDir);
foreach($topLevel as $file) { foreach($topLevel as $file) {
if($file[0] == '.') continue if($file[0] == '.') continue;
$fullPath = '';
$fullPath = $baseDir . '/' . $file; $fullPath = $baseDir . '/' . $file;
if(@is_dir($fullPath . '/') && file_exists($fullPath . '/_exclude.php')) { if(@is_dir($fullPath . '/') && file_exists($fullPath . '/_exclude.php')) {