Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove workaround for PHP 4 and PHP 5.2.3 in JFTP and JXMLElement.

  • Loading branch information...
commit 071872de74cc9352a2815f2f12e89fb75a5686eb 1 parent 9d4fac2
@realityking realityking authored
View
6 libraries/joomla/client/ftp.php
@@ -142,12 +142,6 @@ function __construct($options=array()) {
// Autoloading fails for JBuffer as the class is used as a stream handler
JLoader::load('JBuffer');
}
-
- // @deprecated 11.1
- // Register faked "destructor" in PHP4 to close all connections we might have made
- if (version_compare(PHP_VERSION, '5') == -1) {
- register_shutdown_function(array(&$this, '__destruct'));
- }
}
/**
View
9 libraries/joomla/utilities/xmlelement.php
@@ -21,18 +21,11 @@ class JXMLElement extends SimpleXMLElement
/**
* Get the name of the element.
*
- * Warning: don't use getName() as it's broken up to php 5.2.3
- *
* @return string
*/
public function name()
{
- if (version_compare(phpversion(), '5.2.3', '>')) {
- return (string) $this->getName();
- }
-
- // Workaround php bug number 41867, fixed in 5.2.4
- return (string) $this->aaa->getName();
+ return (string) $this->getName();
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.