makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#13107

Browse source 
#13107


git-svn-id: file:///svn/phpbb/trunk@7847 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-07-09 11:00:14 +00:00
parent 5ccf905efb
commit c923e4191a
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -187,6 +187,7 @@ p a {
<ul class="menu"> <ul class="menu">
<li>[Fix] Parse error in MCP ban (Bug #13109)</li> <li>[Fix] Parse error in MCP ban (Bug #13109)</li>
<li>[Fix] Correctly hide online status in the profile (Bug #13059)</li>
</ul> </ul>

4
phpBB/language/en/acp/bots.php
View file

@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang))
// Bot settings // Bot settings
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'BOTS' => 'Manage bots', 'BOTS' => 'Manage bots',
'BOTS_EXPLAIN' => '&quot;Bots&quot;, &quot;spiders&quot; or &quot;crawlers&quot; are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.', 'BOTS_EXPLAIN' => '“Bots”, “spiders” or “crawlers” are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
'BOT_ACTIVATE' => 'Activate', 'BOT_ACTIVATE' => 'Activate',
'BOT_ACTIVE' => 'Bot active', 'BOT_ACTIVE' => 'Bot active',
'BOT_ADD' => 'Add bot', 'BOT_ADD' => 'Add bot',
@ -51,7 +51,7 @@ $lang = array_merge($lang, array(
'BOT_IP_EXPLAIN' => 'Partial matches are allowed, separate addresses with a comma.', 'BOT_IP_EXPLAIN' => 'Partial matches are allowed, separate addresses with a comma.',
'BOT_NAME' => 'Bot name', 'BOT_NAME' => 'Bot name',
'BOT_NAME_EXPLAIN' => 'Used only for your own information.', 'BOT_NAME_EXPLAIN' => 'Used only for your own information.',
'BOT_NAME_TAKEN' => 'The name is already in use on your board and can\'t be used for the Bot.', 'BOT_NAME_TAKEN' => 'The name is already in use on your board and can’t be used for the Bot.',
'BOT_NEVER' => 'Never', 'BOT_NEVER' => 'Never',
'BOT_STYLE' => 'Bot style', 'BOT_STYLE' => 'Bot style',
'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot.', 'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot.',

2
phpBB/memberlist.php
View file

@ -1440,7 +1440,7 @@ function show_profile($data)
if ($config['load_onlinetrack']) if ($config['load_onlinetrack'])
{ {
$update_time = $config['load_online_time'] * 60; $update_time = $config['load_online_time'] * 60;
$online = (time() - $update_time < $data['session_time'] && ((isset($data['session_viewonline'])) || $auth->acl_get('u_viewonline'))) ? true : false; $online = (time() - $update_time < $data['session_time'] && ((isset($data['session_viewonline']) && $data['session_viewonline']) || $auth->acl_get('u_viewonline'))) ? true : false;
} }
else else
{ {