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/ifx.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/ifx.php')
| -rw-r--r-- | extlib/DB/ifx.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extlib/DB/ifx.php b/extlib/DB/ifx.php index dcb3dbd3e..baa6f2867 100644 --- a/extlib/DB/ifx.php +++ b/extlib/DB/ifx.php @@ -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 @@ -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 @@ -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) { |