mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
bug fixes
schema changes i really hope nothing went wrong git-svn-id: file:///svn/phpbb/trunk@6371 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -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
|
||||
|
@@ -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('');
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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)
|
||||
{
|
||||
|
@@ -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 = '[';
|
||||
}
|
||||
|
Reference in New Issue
Block a user