From 017c07c7bfb28a62731a3bfa015d1d0e147c12e7 Mon Sep 17 00:00:00 2001 From: nate Date: Thu, 10 Apr 2008 19:43:06 +0000 Subject: [PATCH] Fixing case of Xml class references git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6652 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/view/helpers/xml.php | 4 ++-- cake/libs/xml.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cake/libs/view/helpers/xml.php b/cake/libs/view/helpers/xml.php index afb2ccb7a..592b9026c 100644 --- a/cake/libs/view/helpers/xml.php +++ b/cake/libs/view/helpers/xml.php @@ -85,7 +85,7 @@ class XmlHelper extends AppHelper { * @return boolean False if no URL is specified, and the namespace does not exist * default namespace map, otherwise true * @deprecated - * @see XML::addNs() + * @see Xml::addNs() */ function addNs($name, $url = null) { return Xml::addNamespace($name, $url); @@ -95,7 +95,7 @@ class XmlHelper extends AppHelper { * * @param string $name The namespace name or URI * @deprecated - * @see XML::removeNs() + * @see Xml::removeNs() */ function removeNs($name) { Xml::removeGlobalNamespace($name); diff --git a/cake/libs/xml.php b/cake/libs/xml.php index e9a1a3fa7..923abc854 100644 --- a/cake/libs/xml.php +++ b/cake/libs/xml.php @@ -545,7 +545,7 @@ class XmlNode extends Object { $options = array(); } $defaults = array('cdata' => true, 'whitespace' => false, 'convertEntities' => false, 'showEmpty' => true); - $options = array_merge($defaults, XML::options(), $options); + $options = array_merge($defaults, Xml::options(), $options); $tag = !(strpos($this->name, '#') === 0); $d = ''; @@ -702,7 +702,7 @@ class Xml extends XmlNode { */ function __construct($input = null, $options = array()) { $defaults = array('root' => '#document', 'tags' => array(), 'namespaces' => array(), 'version' => '1.0', 'encoding' => 'UTF-8', 'format' => 'attributes'); - $options = array_merge($defaults, XML::options(), $options); + $options = array_merge($defaults, Xml::options(), $options); foreach (array('version', 'encoding', 'namespaces') as $key) { $this->{$key} = $options[$key]; @@ -893,7 +893,7 @@ class Xml extends XmlNode { function addNamespace($prefix, $url) { $_this =& XmlManager::getInstance(); - if ($ns = XML::__resolveNamespace($prefix, $url)) { + if ($ns = Xml::__resolveNamespace($prefix, $url)) { $_this->namespaces = array_merge($_this->namespaces, $ns); return true; }