diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-26 16:09:51 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-26 16:09:51 +0000 |
| commit | ddddda47fb414095371b80f0873dee3986d0d308 (patch) | |
| tree | b71ec4da186fc10801e47bbc38586216031b3b0c /phpBB/includes/db | |
| parent | 920fc0156db872c6200e85da79bf67eb2f416d02 (diff) | |
| download | forums-ddddda47fb414095371b80f0873dee3986d0d308.tar forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.gz forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.bz2 forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.xz forums-ddddda47fb414095371b80f0873dee3986d0d308.zip | |
- fix some oddities (doubled spaces for example)
- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier.
- Changed some permission namings based on suggestions by the community
- Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time.
- Disable submit buttons after clicking for installation and conversions.
git-svn-id: file:///svn/phpbb/trunk@6930 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/firebird.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/postgres.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index ffe5228665..da649ed812 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -498,7 +498,7 @@ class dbal $backtrace = get_backtrace(); $message .= ($sql) ? '<br /><br /><u>SQL</u><br /><br />' . htmlspecialchars($sql) : ''; - $message .= ($backtrace) ? '<br /><br /><u>BACKTRACE</u><br />' . $backtrace : ''; + $message .= ($backtrace) ? '<br /><br /><u>BACKTRACE</u><br />' . $backtrace : ''; $message .= '<br />'; } else diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index 709145c4cf..5ce4949956 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -277,7 +277,7 @@ class dbal_firebird extends dbal { $sql = "SELECT GEN_ID(" . $tablename[1] . "_gen, 0) AS new_id FROM RDB\$DATABASE"; - if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql))) + if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql))) { return false; } diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php index c0a8d930e1..f2e96260ba 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/postgres.php @@ -268,7 +268,7 @@ class dbal_postgres extends dbal if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename)) { $query = "SELECT currval('" . $tablename[1] . "_seq') AS last_value"; - $temp_q_id = @pg_query($this->db_connect_id, $query); + $temp_q_id = @pg_query($this->db_connect_id, $query); if (!$temp_q_id) { |