Changeset 23143 for branches/version-2_13_0/data/module/PEAR.php

Timestamp:

2013/08/28 13:55:43 (7 years ago)

Author:

m_uehara

Message:

#2348 r23140 をマージ

File:

• branches/version-2_13_0/data/module/PEAR.php (modified) (5 diffs)

branches/version-2_13_0/data/module/PEAR.php

@@ -15 +15 @@
  * @copyright  1997-2010 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id$
+ * @version    CVS: commit 01071ee7b71e4d38c4e96fdf0ae5e411841eaec7
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
@@ -79 +79 @@
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.4
+ * @version    Release: @package_version@
  * @link       http://pear.php.net/package/PEAR
  * @see        PEAR_Error
@@ -250 +250 @@
     function isError($data, $code = null)
     {
+        if (!is_object($data)) {
+             return false;
+        }
         if (!is_a($data, 'PEAR_Error')) {
             return false;
@@ -485 +488 @@
             $message->error_message_prefix = '';
             $message     = $message->getMessage();
+
+            // Make sure right data gets passed.
+            $r = new ReflectionClass($error_class);
+            $c = $r->getConstructor();
+            $p = array_shift($c->getParameters());
+            $skipmsg = ($p->getName() != 'message');
         }
 
@@ -789 +798 @@
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.4
+ * @version    Release: @package_version@
  * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
  * @see        PEAR::raiseError(), PEAR::throwError()