tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-04 15:18:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4030 from dhensby/pulls/debug-viewable-data

Browse Source 
FIX Debug::text no longer incorrecty returns "ViewableData_debugger"
This commit is contained in:
Damian Mooyman 2015-04-02 10:15:53 +13:00
commit 2d4a3edd6c
1 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/Debug.php
View File

@ -125,7 +125,12 @@ class Debug {
}
if($hasDebugMethod) {
return $val->debug();
$debug = $val->debug();
// Conditional not necessary after 3.2. See https://github.com/silverstripe/silverstripe-framework/pull/4034
if ($debug instanceof ViewableData_Debugger) {
$debug = $debug->forTemplate();
}
return $debug;
}
}