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 dcb3dbd3ee634cdd84828422c7679e16d10d427b..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
@@ -147,7 +147,7 @@ class DB_ifx extends DB_common
     /**
      * The quantity of transactions begun
      *
-     * {@internal  While this is private, it cannot actually be designated
+     * {@internal  While this is private, it can't actually be designated
      * private in PHP 5 because it is directly accessed in the test suite.}}
      *
      * @var integer
@@ -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();
     }
 
     // }}}
@@ -328,7 +328,7 @@ class DB_ifx extends DB_common
      * See DB_result::fetchInto() for more information.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It cannot be declared "protected"
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result    the query result resource
@@ -387,7 +387,7 @@ class DB_ifx extends DB_common
      * Gets the number of columns in a result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It cannot be declared "protected"
+     * DB_result::numCols() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -411,7 +411,7 @@ class DB_ifx extends DB_common
      * Deletes the result set and frees the memory occupied by the result set
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It cannot be declared "protected"
+     * DB_result::free() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -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];
@@ -555,7 +555,7 @@ class DB_ifx extends DB_common
      *
      * If analyzing a query result and the result has duplicate field names,
      * an error will be raised saying
-     * <samp>cannot distinguish duplicate field names</samp>.
+     * <samp>can't distinguish duplicate field names</samp>.
      *
      * @param object|string  $result  DB_result object from a query or a
      *                                 string containing the name of a table.
@@ -604,7 +604,7 @@ class DB_ifx extends DB_common
         $count = @ifx_num_fields($id);
 
         if (count($flds) != $count) {
-            return $this->raiseError("cannot distinguish duplicate field names");
+            return $this->raiseError("can't distinguish duplicate field names");
         }
 
         if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {