diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-08-06 05:52:41 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-08-06 05:52:41 +0000 |
| commit | 2f901a520326b4d6941ef18fcfce0a9d5ef9cea5 (patch) | |
| tree | 7ef08c7f0bedfed5f6a65278c8dc53194ac16d20 /phpBB/includes/db/dbal.php | |
| parent | b4b901b82552e639cae00c4dc38542cf6fe2d873 (diff) | |
| download | forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar.gz forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar.bz2 forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.tar.xz forums-2f901a520326b4d6941ef18fcfce0a9d5ef9cea5.zip | |
This should end some issues we have been having regarding the proper binary encoding of stuff. :D
Acyd Burn: quit breaking the schema :P
git-svn-id: file:///svn/phpbb/trunk@6238 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/dbal.php')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 8660c43546..dcf9947ddf 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -199,7 +199,14 @@ class dbal } else if (is_string($var)) { - $values[] = "'" . $this->sql_escape($var) . "'"; + if (strpos($key, 'bitfield') === false) + { + $values[] = "'" . $this->sql_escape($var) . "'"; + } + else + { + $values[] = $this->sql_escape_binary($var); + } } else if (is_array($var) && is_string($var[0])) { @@ -228,7 +235,14 @@ class dbal } else if (is_string($var)) { - $values[] = "'" . $this->sql_escape($var) . "'"; + if (strpos($key, 'bitfield') === false) + { + $values[] = "'" . $this->sql_escape($var) . "'"; + } + else + { + $values[] = $this->sql_escape_binary($var); + } } else { @@ -251,7 +265,14 @@ class dbal } else if (is_string($var)) { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; + if (strpos($key, 'bitfield') === false) + { + $values[] = "$key = '" . $this->sql_escape($var) . "'"; + } + else + { + $values[] = "$key = " . $this->sql_escape_binary($var); + } } else { @@ -264,6 +285,11 @@ class dbal return $query; } + function sql_escape_binary($msg) + { + return "'" . $this->sql_escape($msg) . "'"; + } + /** * Build sql statement from array for select and select distinct statements * |