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

Merge pull request #5255 from tractorcow/pulls/4.0/fix-test-location

Browse Source 
BUG move test file to correct folder and fix class_exists
This commit is contained in:
Ingo Schommer 2016-03-31 17:43:08 +13:00
commit 3d1673f687
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/Member.php
View File

@ -522,7 +522,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
*/ */
public static function autoLogin() { public static function autoLogin() {
// Don't bother trying this multiple times // Don't bother trying this multiple times
if (!class_exists('SapphireTest') || !SapphireTest::is_running_test()) { if (!class_exists('SapphireTest', false) || !SapphireTest::is_running_test()) {
self::$_already_tried_to_auto_log_in = true; self::$_already_tried_to_auto_log_in = true;
} }

0
filesystem/AssetAdapterTest.php → tests/filesystem/AssetAdapterTest.php
View File