BUGFIX If SS_Backtrace::get_rendered_backtrace() has $plainText argument

to TRUE, ensure there is no HTML in the output.
silverstripe · Apr 14, 2012 · edaed5e · edaed5e
1 parent 7e3a698
commit edaed5e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dev/Backtrace.php b/dev/Backtrace.php
@@ -159,7 +159,7 @@ static function full_func_name($item, $showArgs = false, $argCharLimit = 10000)
 	 */
 	static function get_rendered_backtrace($bt, $plainText = false, $ignoredFunctions = null) {
 		$bt = self::filter_backtrace($bt, $ignoredFunctions);
-		$result = "<ul>";
+		$result = ($plainText) ? '' : '<ul>';
 		foreach($bt as $item) {
 			if($plainText) {
 				$result .= self::full_func_name($item,true) . "\n";
@@ -177,7 +177,7 @@ static function get_rendered_backtrace($bt, $plainText = false, $ignoredFunction
 				$result .= "</li>\n";
 			}
 		}
-		$result .= "</ul>";
+		if(!$plainText) $result .= '</ul>';
 		return $result;
 	}