Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...

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

diff --git a/extlib/DB/oci8.php b/extlib/DB/oci8.php
index 6ad36643a69c0c4e93bccb3225ef6ef9341f2d8d..d307948713bf84aebea9e9dd410ea3758fb2c5cd 100644 (file)
--- a/extlib/DB/oci8.php
+++ b/extlib/DB/oci8.php
@@ -251,7 +251,7 @@ class DB_oci8 extends DB_common
                                                    $char);
             $error = OCIError();
             if (!empty($error) && $error['code'] == 12541) {
-                // Could not find TNS listener.  Try direct connection.
+                // Couldn't find TNS listener.  Try direct connection.
                 $this->connection = @$connect_function($dsn['username'],
                                                        $dsn['password'],
                                                        null,
@@ -368,7 +368,7 @@ class DB_oci8 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
@@ -415,7 +415,7 @@ class DB_oci8 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
@@ -468,7 +468,7 @@ class DB_oci8 extends DB_common
      * is turned on.
      *
      * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It cannot be declared "protected"
+     * DB_result::numRows() instead.  It can't be declared "protected"
      * because DB_result is a separate object.
      *
      * @param resource $result  PHP's query result resource
@@ -511,7 +511,7 @@ class DB_oci8 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