mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 02:36:38 +02:00
Code Issues Releases Wiki Activity

some tiny fixes...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8087 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-09-12 15:32:11 +00:00
parent 01b46eb4e0
commit e503216834
7 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/db/dbal.php
View File

@@ -99,8 +99,8 @@ class dbal
*/
function sql_add_num_queries($cached = false)
{
$this->num_queries['cached'] += ($cached) ? 1 : 0;
$this->num_queries['normal'] += ($cached) ? 0 : 1;
$this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
$this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
$this->num_queries['total'] += 1;
}

15
phpBB/includes/functions_jabber.php
View File

@@ -695,25 +695,34 @@ class jabber
}
/**
* parse_data like a="b",c="d",...
* parse_data like a="b",c="d",... or like a="a, b", c, d="e", f=g,...
* @param string $data
* @access public
* @return array a => b ...
*/
function parse_data($data)
{
// super basic, but should suffice
$data = explode(',', $data);
$pairs = array();
$key = false;
foreach ($data as $pair)
{
$dd = strpos($pair, '=');
if ($dd)
{
$pairs[substr($pair, 0, $dd)] = trim(substr($pair, $dd + 1), '"');
$key = trim(substr($pair, 0, $dd));
$pairs[$key] = trim(trim(substr($pair, $dd + 1)), '"');
}
else if (strpos(strrev(trim($pair)), '"') === 0 && $key)
{
// We are actually having something left from "a, b" values, add it to the last one we handled.
$pairs[$key] .= ',' . trim(trim($pair), '"');
continue;
}
}
return $pairs;
}

2
phpBB/includes/functions_upload.php
View File

@@ -577,7 +577,7 @@ class fileupload
if (function_exists('mime_content_type'))
{
$mimetype = mime_content_type($filename);
$mimetype = mime_content_type($source_file);
}
// Some browsers choke on a mimetype of application/octet-stream