svn: /pear/packages/MDB2/trunk/ MDB2/Driver/Datatype/Common.php MDB2/Driver/Datatype/pgsql.php package.php

quipo Sun, 27 Dec 2009 23:37:41 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292705 Log: fixed bug #16727: quote(url, 'clob')) fetches URL even if lob_allow_url_include option is false Bug: http://pear.php.net/bugs/16727 (unknown) Changed paths: U pear/packages/MDB2/trunk/MDB2/Driver/Datatype/Common.php U pear/packages/MDB2/trunk/MDB2/Driver/Datatype/pgsql.php U pear/packages/MDB2/trunk/package.php Modified: pear/packages/MDB2/trunk/MDB2/Driver/Datatype/Common.php =================================================================== --- pear/packages/MDB2/trunk/MDB2/Driver/Datatype/Common.php 2009-12-27 23:37:00 UTC (rev 292704) +++ pear/packages/MDB2/trunk/MDB2/Driver/Datatype/Common.php 2009-12-27 23:37:41 UTC (rev 292705) @@ -1288,10 +1288,16 @@ */ function _quoteLOB($value, $quote, $escape_wildcards) { - $value = $this->_readFile($value); - if (PEAR::isError($value)) { - return $value; + $db =& $this->getDBInstance(); + if (PEAR::isError($db)) { + return $db; } + if ($db->options['lob_allow_url_include']) { + $value = $this->_readFile($value); + if (PEAR::isError($value)) { + return $value; + } + } return $this->_quoteText($value, $quote, $escape_wildcards); } Modified: pear/packages/MDB2/trunk/MDB2/Driver/Datatype/pgsql.php =================================================================== --- pear/packages/MDB2/trunk/MDB2/Driver/Datatype/pgsql.php 2009-12-27 23:37:00 UTC (rev 292704) +++ pear/packages/MDB2/trunk/MDB2/Driver/Datatype/pgsql.php 2009-12-27 23:37:41 UTC (rev 292705) @@ -239,6 +239,16 @@ */ function _quoteCLOB($value, $quote, $escape_wildcards) { + $db =& $this->getDBInstance(); + if (PEAR::isError($db)) { + return $db; + } + if ($db->options['lob_allow_url_include']) { + $value = $this->_readFile($value); + if (PEAR::isError($value)) { + return $value; + } + } return $this->_quoteText($value, $quote, $escape_wildcards); } @@ -261,11 +271,17 @@ if (!$quote) { return $value; } + $db =& $this->getDBInstance(); + if (PEAR::isError($db)) { + return $db; + } + if ($db->options['lob_allow_url_include']) { + $value = $this->_readFile($value); + if (PEAR::isError($value)) { + return $value; + } + } if (version_compare(PHP_VERSION, '5.2.0RC6', '>=')) { - $db =& $this->getDBInstance(); - if (PEAR::isError($db)) { - return $db; - } $connection = $db->getConnection(); if (PEAR::isError($connection)) { return $connection; Modified: pear/packages/MDB2/trunk/package.php =================================================================== --- pear/packages/MDB2/trunk/package.php 2009-12-27 23:37:00 UTC (rev 292704) +++ pear/packages/MDB2/trunk/package.php 2009-12-27 23:37:41 UTC (rev 292705) @@ -10,6 +10,7 @@ - fixed bug #15912: MDB2::loadClass can return MDB2_OK without loading class - fixed bug #16020: unable to set params via dsn string in parseDSN() - fixed bug #16508: reusing var name + return by ref [rix0r] +- fixed bug #16727: quote(url, 'clob')) fetches URL even if lob_allow_url_include option is false - fixed unreported bug in parseDSN() and oracle's Easy Connect syntax - PHP 5.3 compatibility fixes - added new sqlsrv driver (native SQL Server driver) [chrisdpucci]