diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-16 10:05:23 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-16 10:05:23 +0100 |
| commit | 0344e61b8cd5d3964bcfae147e2bebc8c74fa3be (patch) | |
| tree | 543d810a507a24bd3222900a846a07d6c98b213c /phpBB/includes/functions_jabber.php | |
| parent | f616d9169ee7117fc47f3eac0d42568e2668a2fa (diff) | |
| parent | 63da128ee5891971cc9e4f283572e0198174d692 (diff) | |
| download | forums-0344e61b8cd5d3964bcfae147e2bebc8c74fa3be.tar forums-0344e61b8cd5d3964bcfae147e2bebc8c74fa3be.tar.gz forums-0344e61b8cd5d3964bcfae147e2bebc8c74fa3be.tar.bz2 forums-0344e61b8cd5d3964bcfae147e2bebc8c74fa3be.tar.xz forums-0344e61b8cd5d3964bcfae147e2bebc8c74fa3be.zip | |
Merge pull request #3237 from MGaetan89/ticket/12487
[ticket/12487] Update PHP code
* MGaetan89/ticket/12487:
[ticket/12487] Update PHP code
Diffstat (limited to 'phpBB/includes/functions_jabber.php')
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index bd2e9e93ac..a38888a861 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -87,8 +87,7 @@ class jabber */ static public function can_use_ssl() { - // Will not work with PHP >= 5.2.1 or < 5.2.3RC2 until timeout problem with ssl hasn't been fixed (http://bugs.php.net/41236) - return ((version_compare(PHP_VERSION, '5.2.1', '<') || version_compare(PHP_VERSION, '5.2.3RC2', '>=')) && @extension_loaded('openssl')) ? true : false; + return @extension_loaded('openssl'); } /** |