From 49b720ffd046f1953d664f8e8ed7470064a4f15b Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Thu, 26 Nov 2009 23:09:05 +0000 Subject: [PATCH] API CHANGE: removed deprecated extend calls (r93632). API CHANGE: removed fieldExists(). Use hasField() (r93633). API CHANGE removed listOfFields() (r93647). API CHANGE: removed Tag() and URL() from Image. Use getTag() and getURL(). BUGFIX: updated Image.php to use getTag() (r93639, r93646). API CHANGE: removed val(). Use XML_val() (r93650). API CHANGE: removed $add_action. Use singlar_name or lang tables (r93658). API CHANGE: removed ConfirmedFormAction (r93674). API CHANGE: removed ajax_render on CTF (r93679). git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93685 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 4 ---- code/SideReport.php | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 56d210f6..3a082f0b 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -277,10 +277,6 @@ class LeftAndMain extends Controller { ) ); - // DEPRECATED 2.3: Use init() - $dummy = null; - $this->extend('augmentInit', $dummy); - $dummy = null; $this->extend('init', $dummy); } diff --git a/code/SideReport.php b/code/SideReport.php index 35c1a1f4..e9edab34 100755 --- a/code/SideReport.php +++ b/code/SideReport.php @@ -48,7 +48,7 @@ abstract class SideReport extends Object { if(is_string($fieldSource)) { $val .= Convert::raw2xml($record->$fieldSource); } else { - $val .= $record->val($fieldSource[0], $fieldSource[1]); + $val .= $record->XML_val($fieldSource[0], $fieldSource[1]); } if(isset($fieldInfo['newline']) && $fieldInfo['newline']) $result .= "
";