Merge branch 'doc-backup-restore-def-vals' into 'nightly'

[quix0rs-gnu-social.git] / extlib / DB / ifx.php

diff --git a/extlib/DB/ifx.php b/extlib/DB/ifx.php
index baa6f2867c37c147e6c0facf3558fe67846b27fa..5c5709f79e14f76a3df6990af27d20854afc2a38 100644 (file)
--- a/extlib/DB/ifx.php
+++ b/extlib/DB/ifx.php
@@ -6,7 +6,7 @@
  * The PEAR DB driver for PHP's ifx extension
  * for interacting with Informix databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:
@@ -20,7 +20,7 @@
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: ifx.php,v 1.75 2007/07/06 05:19:21 aharvey Exp $
+ * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
  */
 
@@ -48,7 +48,7 @@ require_once 'DB/common.php';
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.14RC1
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_ifx extends DB_common
@@ -167,13 +167,13 @@ class DB_ifx extends DB_common
     // {{{ constructor
 
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_ifx()
+    function __construct()
     {
-        $this->DB_common();
+        parent::__construct();
     }
 
     // }}}
@@ -536,7 +536,7 @@ class DB_ifx extends DB_common
      */
     function errorCode($nativecode)
     {
-        if (ereg('SQLCODE=(.*)]', $nativecode, $match)) {
+        if (preg_match('/SQLCODE=(.*)]/', $nativecode, $match)) {
             $code = $match[1];
             if (isset($this->errorcode_map[$code])) {
                 return $this->errorcode_map[$code];