svn: /pear/pear-core/ tags/PEAR-1.9.5/PEAR.php tags/PEAR-1.9.5/package.xml tags/PEAR-1.9.5/package2.xml trunk/PEAR.php

[Helgi Þormar Þorbjörnsson]

dufuz Sun, 17 Jul 2011 19:26:54 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=313340

Log:
Back out the fix for Bug #18656 as PHP (5.3.7 and 5.4) no longer emits a warning when is_a is passed an appropriate string.

Bug: http://pear.php.net/bugs/18656 (unknown)

Changed paths:
U pear/pear-core/tags/PEAR-1.9.5/PEAR.php
U pear/pear-core/tags/PEAR-1.9.5/package.xml
U pear/pear-core/tags/PEAR-1.9.5/package2.xml
U pear/pear-core/trunk/PEAR.php

Modified: pear/pear-core/tags/PEAR-1.9.5/PEAR.php
===================================================================
--- pear/pear-core/tags/PEAR-1.9.5/PEAR.php 2011-07-17 19:22:32 UTC (rev 313339)
+++ pear/pear-core/tags/PEAR-1.9.5/PEAR.php 2011-07-17 19:26:54 UTC (rev 313340)
@@ -249,7 +249,7 @@
*/
function isError($data, $code = null)
{
- if (!is_object || !is_a($data, 'PEAR_Error')) {
+ if (!is_a($data, 'PEAR_Error')) {
return false;
}


Modified: pear/pear-core/tags/PEAR-1.9.5/package.xml
===================================================================
--- pear/pear-core/tags/PEAR-1.9.5/package.xml 2011-07-17 19:22:32 UTC (rev 313339)
+++ pear/pear-core/tags/PEAR-1.9.5/package.xml 2011-07-17 19:26:54 UTC (rev 313340)
@@ -92,7 +92,6 @@
<state>stable</state>
<notes>
Bug Fixes:
- * Bug #18656: E_WARNING errors from is_a() usage in PEAR::isError on PHP 5.4+ [dufuz]
</notes>
<deps>
<dep type="php" rel="ge" version="4.4.0"/>

Modified: pear/pear-core/tags/PEAR-1.9.5/package2.xml
===================================================================
--- pear/pear-core/tags/PEAR-1.9.5/package2.xml 2011-07-17 19:22:32 UTC (rev 313339)
+++ pear/pear-core/tags/PEAR-1.9.5/package2.xml 2011-07-17 19:26:54 UTC (rev 313340)
@@ -94,7 +94,6 @@
<license uri="http://opensource.org/licenses/bsd-license.php">New BSD License</license>
<notes>
Bug Fixes:
- * Bug #18656: E_WARNING errors from is_a() usage in PEAR::isError on PHP 5.4+ [dufuz]
</notes>
<contents>
<dir name="/">

Modified: pear/pear-core/trunk/PEAR.php
===================================================================
--- pear/pear-core/trunk/PEAR.php 2011-07-17 19:22:32 UTC (rev 313339)
+++ pear/pear-core/trunk/PEAR.php 2011-07-17 19:26:54 UTC (rev 313340)
@@ -249,7 +249,7 @@
*/
function isError($data, $code = null)
{
- if (!is_object($data) || !is_a($data, 'PEAR_Error')) {
+ if (!is_a($data, 'PEAR_Error')) {
return false;
}