diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
| commit | b10f362ede8c39746c168363bf4fa6481995592b (patch) | |
| tree | c7a6d4d2ca280ba50d1dbac1113507432e3fe12e /extlib/DB/oci8.php | |
| parent | 5ab709b73977131813884558bf56d97172a7aa26 (diff) | |
| parent | fc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff) | |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib/DB/oci8.php')
| -rw-r--r-- | extlib/DB/oci8.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extlib/DB/oci8.php b/extlib/DB/oci8.php index 6ad36643a..d30794871 100644 --- 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 |