From 9bd6dd9ade1b9b8db0a350bd692bf34dca1f9f70 Mon Sep 17 00:00:00 2001 From: Hamish Friedlander Date: Tue, 12 Mar 2013 10:42:02 +1300 Subject: [PATCH] API Make default_cast Text and not HTMLText --- tests/view/SSViewerTest.php | 6 +++--- view/ViewableData.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/view/SSViewerTest.php b/tests/view/SSViewerTest.php index 225773c0d..01d789a26 100644 --- a/tests/view/SSViewerTest.php +++ b/tests/view/SSViewerTest.php @@ -1218,14 +1218,14 @@ class SSViewerTest_GlobalProvider implements TemplateGlobalProvider, TestOnly { public static function get_template_global_variables() { return array( - 'SSViewerTest_GlobalHTMLFragment' => array('method' => 'get_html'), - 'SSViewerTest_GlobalHTMLEscaped' => array('method' => 'get_html', 'casting' => 'Varchar'), + 'SSViewerTest_GlobalHTMLFragment' => array('method' => 'get_html', 'casting' => 'HTMLText'), + 'SSViewerTest_GlobalHTMLEscaped' => array('method' => 'get_html'), 'SSViewerTest_GlobalAutomatic', 'SSViewerTest_GlobalReferencedByString' => 'get_reference', 'SSViewerTest_GlobalReferencedInArray' => array('method' => 'get_reference'), - 'SSViewerTest_GlobalThatTakesArguments' => array('method' => 'get_argmix') + 'SSViewerTest_GlobalThatTakesArguments' => array('method' => 'get_argmix', 'casting' => 'HTMLText') ); } diff --git a/view/ViewableData.php b/view/ViewableData.php index 5b49ff638..548f2ad14 100644 --- a/view/ViewableData.php +++ b/view/ViewableData.php @@ -32,7 +32,7 @@ class ViewableData extends Object implements IteratorAggregate { * * @var string */ - public static $default_cast = 'HTMLText'; + public static $default_cast = 'Text'; /** * @var array