adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing case of Xml class references

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6652 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-04-10 19:43:06 +00:00
parent a89beea029
commit 017c07c7bf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/view/helpers/xml.php
View file

@ -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);

6
cake/libs/xml.php
View file

@ -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;
}