mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merge pull request #313 from halkyon/sapphire
--- Re-enable E_STRICT after it was temporarily turned off. Additionally, this fixes "class SS_Log not found" errors by explicitly requiring the required debugging classes in Core.php bootstrap code, because `SS_ClassLoader::registerAutoloader()` cant always guarantee that at the time the strict error was issued the Debug/Log classes were loaded yet. This should be pulled *after* this issue is fixed: http://open.silverstripe.org/ticket/7135 which allieviates the problem of changing every `getCMSFields` method when upgrading because of the parameter differences.
This commit is contained in:
commit
2db0be6cc0
@ -40,7 +40,7 @@
|
||||
|
||||
// ALL errors are reported, including E_STRICT by default *unless* the site is in
|
||||
// live mode, where reporting is limited to fatal errors and warnings (see later in this file)
|
||||
error_reporting(E_ALL & ~(E_STRICT));
|
||||
error_reporting(E_ALL | E_STRICT);
|
||||
|
||||
/**
|
||||
* Include _ss_environment.php files
|
||||
@ -223,6 +223,10 @@ require_once 'core/ClassInfo.php';
|
||||
require_once 'view/TemplateGlobalProvider.php';
|
||||
require_once 'control/Director.php';
|
||||
require_once 'dev/Debug.php';
|
||||
require_once 'dev/DebugView.php';
|
||||
require_once 'dev/Backtrace.php';
|
||||
require_once 'dev/ZendLog.php';
|
||||
require_once 'dev/Log.php';
|
||||
require_once 'filesystem/FileFinder.php';
|
||||
require_once 'core/manifest/ClassLoader.php';
|
||||
require_once 'core/manifest/ClassManifest.php';
|
||||
|
Loading…
x
Reference in New Issue
Block a user