Skip to content

Commit adeefc9

Browse files
committed
Merge pull request #23 from realityking/php4
Remove workaround for PHP 4 and PHP 5.2.3 in JFTP and JXMLElement.
2 parents d3f85df + 2e3a57b commit adeefc9

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

libraries/joomla/client/ftp.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,6 @@ function __construct($options=array()) {
142142
// Autoloading fails for JBuffer as the class is used as a stream handler
143143
JLoader::load('JBuffer');
144144
}
145-
146-
// @deprecated 11.1
147-
// Register faked "destructor" in PHP4 to close all connections we might have made
148-
if (version_compare(PHP_VERSION, '5') == -1) {
149-
register_shutdown_function(array(&$this, '__destruct'));
150-
}
151145
}
152146

153147
/**

libraries/joomla/utilities/xmlelement.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,11 @@ class JXMLElement extends SimpleXMLElement
2121
/**
2222
* Get the name of the element.
2323
*
24-
* Warning: don't use getName() as it's broken up to php 5.2.3
25-
*
2624
* @return string
2725
*/
2826
public function name()
2927
{
30-
if (version_compare(phpversion(), '5.2.3', '>')) {
31-
return (string) $this->getName();
32-
}
33-
34-
// Workaround php bug number 41867, fixed in 5.2.4
35-
return (string) $this->aaa->getName();
28+
return (string) $this->getName();
3629
}
3730

3831
/**

0 commit comments

Comments
 (0)