diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-09-16 06:07:06 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-09-16 06:07:06 +0000 |
| commit | fe1367b31e7711b52f103ade06eec538823d467c (patch) | |
| tree | d452300653914573a5a7c89b7d33a800093c6937 /phpBB/includes | |
| parent | 9479bc428f10e166682087e8e61c19efcbbe2751 (diff) | |
| download | forums-fe1367b31e7711b52f103ade06eec538823d467c.tar forums-fe1367b31e7711b52f103ade06eec538823d467c.tar.gz forums-fe1367b31e7711b52f103ade06eec538823d467c.tar.bz2 forums-fe1367b31e7711b52f103ade06eec538823d467c.tar.xz forums-fe1367b31e7711b52f103ade06eec538823d467c.zip | |
bug fixes
schema changes
i really hope nothing went wrong
git-svn-id: file:///svn/phpbb/trunk@6371 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/mysql4.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/db/oracle.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/db/postgres.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/functions_compress.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 11 |
5 files changed, 11 insertions, 13 deletions
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php index dd89de5e5c..3740d22669 100644 --- a/phpBB/includes/db/mysql4.php +++ b/phpBB/includes/db/mysql4.php @@ -27,7 +27,6 @@ if (!defined('SQL_LAYER')) /** * MySQL4 Database Abstraction Layer * Compatible with: -* MySQL 4.0+ * MySQL 4.1+ * MySQL 5.0+ * @package dbal diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index e87b7aa1f9..b988bc6a3c 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -42,7 +42,7 @@ class dbal_oracle extends dbal $this->server = $sqlserver . (($port) ? ':' . $port : ''); $this->dbname = $database; - $this->db_connect_id = ($this->persistency) ? @ociplogon($this->user, $sqlpassword, $this->server) : @ocinlogon($this->user, $sqlpassword, $this->server); + $this->db_connect_id = ($this->persistency) ? @ociplogon($this->user, $sqlpassword, $this->server, 'UTF8') : @ocinlogon($this->user, $sqlpassword, $this->server, 'UTF8'); return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); } diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php index a91a8e81bb..ff58269f51 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/postgres.php @@ -268,13 +268,6 @@ class dbal_postgres extends dbal } $row = @pg_fetch_assoc($query_id, null); - if ($row) - { - foreach ($row as $key => $value) - { - $row[$key] = (strpos($key, 'bitfield') === false) ? $value : pg_unescape_bytea($value); - } - } return ($query_id) ? $row : false; } diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php index 09ad1f4e8f..cbada8a76d 100644 --- a/phpBB/includes/functions_compress.php +++ b/phpBB/includes/functions_compress.php @@ -322,8 +322,7 @@ class compress_zip extends compress { $name = str_replace('\\', '/', $name); - $dtime = dechex($this->unix_to_dos_time($stat[9])); - $hexdtime = pack('H8', $dtime[6] . $dtime[7] . $dtime[4] . $dtime[5] . $dtime[2] . $dtime[3] . $dtime[0] . $dtime[1]); + $hexdtime = pack('V', $this->unix_to_dos_time($stat[9])); if ($is_dir) { diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 70d6e13f4d..f6b3302dc1 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -505,7 +505,8 @@ class bbcode_firstpass extends bbcode do { $pos = strlen($in); - for ($i = 0; $i < strlen($tok); ++$i) + $tok_len = strlen($tok); + for ($i = 0; $i < $tok_len; ++$i) { $tmp_pos = strpos($in, $tok{$i}); @@ -523,7 +524,7 @@ class bbcode_firstpass extends bbcode if ($tok == ']') { // if $tok is ']' the buffer holds a tag - if ($buffer == '/list' && sizeof($list_end_tags)) + if (strtolower($buffer) == '/list' && sizeof($list_end_tags)) { $out .= array_pop($list_end_tags) . ']'; $tok = '['; @@ -539,6 +540,12 @@ class bbcode_firstpass extends bbcode { array_push($list_end_tags, '/list:o:' . $this->bbcode_uid); } + + if (strtolower(substr($buffer, 0, 4)) == 'list') + { + $buffer = 'list' . substr($buffer, 4, $pos); + } + $out .= $buffer . ':' . $this->bbcode_uid . ']'; $tok = '['; } |