diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-09 17:59:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-09 17:59:27 +0000 |
| commit | 0513ef4d17e32c8be1fec6615918e6d694667738 (patch) | |
| tree | f7aad03713f11023643d7c6fb7192b5b96a1ffe2 /phpBB/includes/db | |
| parent | 9732b0deb29ed149c4e9b602fc7d16ac721389a6 (diff) | |
| download | forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar.gz forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar.bz2 forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar.xz forums-0513ef4d17e32c8be1fec6615918e6d694667738.zip | |
- added new query type to dbal's sql_build_array
- allow setting custom template path
- adjusted module class to correctly parse trees with more than one category
- added caching to module class
git-svn-id: file:///svn/phpbb/trunk@5268 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index caa6f70a00..4aaaa62790 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -28,6 +28,7 @@ class dbal var $sql_report = ''; var $cache_num_queries = 0; + var $dbname = ''; /** * return on error or display error message @@ -99,6 +100,7 @@ class dbal * Build sql statement from array for insert/update/select statements * * Idea for this from Ikonboard + * Possible query values: INSERT, INSERT_SELECT, MULTI_INSERT, UPDATE, SELECT */ function sql_build_array($query, $assoc_ary = false) { @@ -109,7 +111,7 @@ class dbal $fields = array(); $values = array(); - if ($query == 'INSERT') + if ($query == 'INSERT' || $query == 'INSERT_SELECT') { foreach ($assoc_ary as $key => $var) { @@ -119,17 +121,21 @@ class dbal { $values[] = 'NULL'; } - elseif (is_string($var)) + else if (is_string($var)) { $values[] = "'" . $this->sql_escape($var) . "'"; } + else if (is_array($var) && is_string($var[0])) + { + $values[] = $var[0]; + } else { $values[] = (is_bool($var)) ? intval($var) : $var; } } - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; + $query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' '; } else if ($query == 'MULTI_INSERT') { |