banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1485504: applied two patches from MDB2's repository

Browse Source
release-0.6
alecpl 16 years ago
parent 03be2b97c4
commit 8e2a5a76d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
program/lib/MDB2.php
Unescape Escape View File

@ -2915,9 +2915,9 @@ class MDB2_Driver_Common extends PEAR
$colon = ':'; $colon = ':';
$positions = array(); $positions = array();
$position = 0; $position = 0;
$ignores = $this->sql_comments; $ignores = $this->string_quoting;
$ignores[] = $this->string_quoting;
$ignores[] = $this->identifier_quoting; $ignores[] = $this->identifier_quoting;
$ignores[] = $this->sql_comments;
while ($position < strlen($query)) { while ($position < strlen($query)) {
$q_position = strpos($query, $question, $position); $q_position = strpos($query, $question, $position);
$c_position = strpos($query, $colon, $position); $c_position = strpos($query, $colon, $position);
@ -3148,7 +3148,7 @@ class MDB2_Driver_Common extends PEAR
function getSequenceName($sqn) function getSequenceName($sqn)
{ {
return sprintf($this->options['seqname_format'], return sprintf($this->options['seqname_format'],
preg_replace('/[^a-z0-9_\$.]/i', '_', $sqn)); preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn));
} }
// }}} // }}}

Write Preview
Loading…
Cancel
Save