From 5fcf4c7bb3f722b49182c69594fe897f8ff4767e Mon Sep 17 00:00:00 2001 From: nate Date: Fri, 1 Feb 2008 05:00:44 +0000 Subject: [PATCH] Clean-up from XML commit git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6423 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/view/helpers/xml.php | 11 +---------- cake/libs/xml.php | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php index 0a98373c7..d400404d5 100644 --- a/cake/libs/view/helpers/xml.php +++ b/cake/libs/view/helpers/xml.php @@ -214,16 +214,7 @@ class XmlHelper extends AppHelper { if (!class_exists('XML') && !class_exists('xml')) { App::import('Core', 'Xml'); } - $options = array_merge(array('attributes' => false, 'format' => 'attributes'), $options); - - switch ($options['format']) { - case 'tags': - break; - case 'attributes': - break; - } - - $data = new Xml($data); + $data = new Xml($data, array_merge(array('attributes' => false, 'format' => 'attributes'), $options)); return $data->toString(false); } } diff --git a/cake/libs/xml.php b/cake/libs/xml.php index b3b327fb9..2463abee3 100644 --- a/cake/libs/xml.php +++ b/cake/libs/xml.php @@ -27,8 +27,7 @@ * @lastmodified $Date$ * @license http://www.opensource.org/licenses/mit-license.php The MIT License */ -uses('set'); -define('STACK_LIMIT', 18); +App::import('Core', 'Set'); /** * XML node.