cvs: pear /MDB2/MDB2/Driver ibase.php

quipo Wed Oct 25 13:12:43 2006 UTC Modified files: /pear/MDB2/MDB2/Driver ibase.php Log: delimiters are empty for 'identifier_quoting' http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/ibase.php?r1=1.199&r2=1.200&diff_format=u Index: pear/MDB2/MDB2/Driver/ibase.php diff -u pear/MDB2/MDB2/Driver/ibase.php:1.199 pear/MDB2/MDB2/Driver/ibase.php:1.200 --- pear/MDB2/MDB2/Driver/ibase.php:1.199 Tue Oct 24 11:38:41 2006 +++ pear/MDB2/MDB2/Driver/ibase.php Wed Oct 25 13:12:43 2006 @@ -43,7 +43,7 @@ // | Author: Lorenzo Alberton <l.alberton@quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: ibase.php,v 1.199 2006/10/24 11:38:41 lsmith Exp $ +// $Id: ibase.php,v 1.200 2006/10/25 13:12:43 quipo Exp $ /** * MDB2 FireBird/InterBase driver @@ -813,21 +813,23 @@ } // skip any delimited strings foreach ($ignores as $ignore) { - if (is_int($start_quote = strpos($query, $ignore['start'], $position)) && $start_quote < $p_position) { - $end_quote = $start_quote; - do { - if (!is_int($end_quote = strpos($query, $ignore['end'], $end_quote + 1))) { - if ($ignore['end'] === "\n") { - $end_quote = strlen($query) - 1; - } else { - $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null, - 'query with an unterminated text string specified', __FUNCTION__); - return $err; + if (!empty($ignore['start'])) { + if (is_int($start_quote = strpos($query, $ignore['start'], $position)) && $start_quote < $p_position) { + $end_quote = $start_quote; + do { + if (!is_int($end_quote = strpos($query, $ignore['end'], $end_quote + 1))) { + if ($ignore['end'] === "\n") { + $end_quote = strlen($query) - 1; + } else { + $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null, + 'query with an unterminated text string specified', __FUNCTION__); + return $err; + } } - } - } while ($ignore['escape'] && $query[($end_quote - 1)] == $ignore['escape']); - $position = $end_quote + 1; - continue(2); + } while ($ignore['escape'] && $query[($end_quote - 1)] == $ignore['escape']); + $position = $end_quote + 1; + continue(2); + } } } if ($query[$position] == $placeholder_type_guess) {