cvs: pear /MDB2/MDB2/Driver/Datatype Common.php
| From: | Lukas Smith | Date: | Sun, 20 Aug 2006 07:21:42 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Datatype Common.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-41751@lists.php.net to get a copy of this message | ||
lsmith Sun Aug 20 07:21:42 2006 UTC
Modified files:
/pear/MDB2/MDB2/Driver/Datatype Common.php
Log:
- fixed rtrim() handling in _retrieveLOB(&$lob)
http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/Datatype/Common.php?r1=1.105&r2=1.106&diff_format=u
Index: pear/MDB2/MDB2/Driver/Datatype/Common.php
diff -u pear/MDB2/MDB2/Driver/Datatype/Common.php:1.105
pear/MDB2/MDB2/Driver/Datatype/Common.php:1.106
--- pear/MDB2/MDB2/Driver/Datatype/Common.php:1.105 Fri Aug 11 09:42:45 2006
+++ pear/MDB2/MDB2/Driver/Datatype/Common.php Sun Aug 20 07:21:42 2006
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: Common.php,v 1.105 2006/08/11 09:42:45 lsmith Exp $
+// $Id: Common.php,v 1.106 2006/08/20 07:21:42 lsmith Exp $
require_once 'MDB2/LOB.php';
@@ -1423,6 +1423,14 @@
{
if (is_null($lob['value'])) {
$lob['value'] = $lob['resource'];
+
+ $db =& $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ if ($db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
+ $lob['value'] = rtrim($lob['value']);
+ }
}
$lob['loaded'] = true;
return MDB2_OK;