From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 30 Oct 2005 18:08:17 +0000 (+0000)
Subject: MFB51: Improve iconv skip conditions
X-Git-Tag: RELEASE_2_0_1~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eed561d103276315fd2a1d97b2484452802c5d0;p=php

MFB51: Improve iconv skip conditions
---

diff --git a/ext/iconv/tests/skipif.inc b/ext/iconv/tests/skipif.inc
index 6f7bbf2b86..631e6f8bf3 100644
--- a/ext/iconv/tests/skipif.inc
+++ b/ext/iconv/tests/skipif.inc
@@ -6,7 +6,7 @@
 //  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
 //  @dl("iconv$dlext");
 //}
-if (!extension_loaded("iconv")) {
-    die("skip iconv extension not available\n");
+if (!function_exists("iconv")) {
+    die("skip iconv function not available\n");
 }
 ?>
\ No newline at end of file
diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 6b7320d06b..8427f4c4d1 100644
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -2,7 +2,7 @@
 Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect)
 --SKIPIF--
 <?php
-	if (!extension_loaded('iconv')) print 'skip';
+	if (!function_exists('iconv')) print 'skip';
 ?>
 --FILE--
 <?php