From e4084d0f5ae13f4dbe79e7485d252fce3c5bce14 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 28 Oct 2013 19:39:15 +0100
Subject: [PATCH] PEAR lib updated to 1.9.4 (seems only installation stuff
 changed)

---
 extlib/PEAR.php                     | 6 +++---
 extlib/PEAR/ErrorStack.php          | 6 +++---
 extlib/PEAR/Exception.php           | 4 ++--
 extlib/PEAR/FixPHP5PEARWarnings.php | 7 +++++++
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 extlib/PEAR/FixPHP5PEARWarnings.php

diff --git a/extlib/PEAR.php b/extlib/PEAR.php
index fec8de45cc..2aa85259d6 100644
--- a/extlib/PEAR.php
+++ b/extlib/PEAR.php
@@ -14,7 +14,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2010 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PEAR.php 307683 2011-01-23 21:56:12Z dufuz $
+ * @version    CVS: $Id: PEAR.php 313023 2011-07-06 19:17:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -78,7 +78,7 @@ $GLOBALS['_PEAR_error_handler_stack']    = array();
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.2
+ * @version    Release: 1.9.4
  * @link       http://pear.php.net/package/PEAR
  * @see        PEAR_Error
  * @since      Class available since PHP 4.0.2
@@ -788,7 +788,7 @@ function _PEAR_call_destructors()
  * @author     Gregory Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.2
+ * @version    Release: 1.9.4
  * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
  * @see        PEAR::raiseError(), PEAR::throwError()
  * @since      Class available since PHP 4.0.2
diff --git a/extlib/PEAR/ErrorStack.php b/extlib/PEAR/ErrorStack.php
index 3229fba520..0303f5273a 100644
--- a/extlib/PEAR/ErrorStack.php
+++ b/extlib/PEAR/ErrorStack.php
@@ -23,7 +23,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2004-2008 Greg Beaver
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ErrorStack.php 307683 2011-01-23 21:56:12Z dufuz $
+ * @version    CVS: $Id: ErrorStack.php 313023 2011-07-06 19:17:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR_ErrorStack
  */
 
@@ -132,12 +132,12 @@ define('PEAR_ERRORSTACK_ERR_OBJTOSTRING', 2);
  * $local_stack = new PEAR_ErrorStack('MyPackage');
  * </code>
  * @author     Greg Beaver <cellog@php.net>
- * @version    1.9.2
+ * @version    1.9.4
  * @package    PEAR_ErrorStack
  * @category   Debugging
  * @copyright  2004-2008 Greg Beaver
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ErrorStack.php 307683 2011-01-23 21:56:12Z dufuz $
+ * @version    CVS: $Id: ErrorStack.php 313023 2011-07-06 19:17:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR_ErrorStack
  */
 class PEAR_ErrorStack {
diff --git a/extlib/PEAR/Exception.php b/extlib/PEAR/Exception.php
index d0327b141b..4a0e7b86fa 100644
--- a/extlib/PEAR/Exception.php
+++ b/extlib/PEAR/Exception.php
@@ -13,7 +13,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Exception.php 307683 2011-01-23 21:56:12Z dufuz $
+ * @version    CVS: $Id: Exception.php 313023 2011-07-06 19:17:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.3.3
  */
@@ -89,7 +89,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.2
+ * @version    Release: 1.9.4
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.3.3
  *
diff --git a/extlib/PEAR/FixPHP5PEARWarnings.php b/extlib/PEAR/FixPHP5PEARWarnings.php
new file mode 100644
index 0000000000..be5dc3ce70
--- /dev/null
+++ b/extlib/PEAR/FixPHP5PEARWarnings.php
@@ -0,0 +1,7 @@
+<?php
+if ($skipmsg) {
+    $a = &new $ec($code, $mode, $options, $userinfo);
+} else {
+    $a = &new $ec($message, $code, $mode, $options, $userinfo);
+}
+?>
\ No newline at end of file
-- 
2.39.5