makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/cron.php
View file

@ -259,18 +259,29 @@ switch ($cron_type)
// Unloading cache and closing db after having done the dirty work.
if ($use_shutdown_function)
{
register_shutdown_function('unlock_cron');
register_shutdown_function('garbage_collection');
}
else
{
unlock_cron();
garbage_collection();
}
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = '0'
WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'";
$db->sql_query($sql);
exit;
/**
* Unlock cron script
*/
function unlock_cron()
{
global $db;
$sql = 'UPDATE ' . CONFIG_TABLE . "
SET config_value = '0'
WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'";
$db->sql_query($sql);
}
?>

1
phpBB/docs/CHANGELOG.html
View file

@ -204,6 +204,7 @@ p a {
<li>[Fix] Allow the merge selection screen to work (Bug #14363)</li>
<li>[Change] Require additional permissions for copying permission when editing forums </li>
<li>[Fix] Local magic URLs no longer get an additional trailing slash (Bug #14362)</li>
<li>[Fix] Do not let the cron script stale for one hour if register_shutdown_function is not able to be called (Bug #14436)</li>
</ul>
</div>

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

2
phpBB/search.php
View file

@ -447,6 +447,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
}
$user->add_lang('viewtopic');
// Grab icons
$icons = $cache->obtain_icons();

2
phpBB/styles/prosilver/theme/common.css
View file

@ -275,7 +275,7 @@ span.corners-bottom {
}
span.corners-bottom span {
background-image: none;;
background-image: none;
background-position: 100% 100%;
}