mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
only very tiny fixes.
git-svn-id: file:///svn/phpbb/trunk@6956 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
c83a2fa1d3
commit
7c8f4431d3
6 changed files with 16 additions and 5 deletions
|
@ -620,6 +620,12 @@ class auth_admin extends auth
|
||||||
|
|
||||||
foreach ($hold_ary as $forum_id => $auth_ary)
|
foreach ($hold_ary as $forum_id => $auth_ary)
|
||||||
{
|
{
|
||||||
|
// If there is no forum present the database holds auth information for a non-existent forum... continue then
|
||||||
|
if ($forum_id && !isset($forum_names[$forum_id]))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$template->assign_block_vars('role_mask', array(
|
$template->assign_block_vars('role_mask', array(
|
||||||
'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_names[$forum_id],
|
'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_names[$forum_id],
|
||||||
'FORUM_ID' => $forum_id)
|
'FORUM_ID' => $forum_id)
|
||||||
|
|
|
@ -1701,7 +1701,7 @@ function add_bots()
|
||||||
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
|
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
|
||||||
'W3C [Validator]' => array('W3C_*Validator', ''),
|
'W3C [Validator]' => array('W3C_*Validator', ''),
|
||||||
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
|
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
|
||||||
'Yacy [Bot]' => array('yacybot', ''),
|
'YaCy [Bot]' => array('yacybot', ''),
|
||||||
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
|
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
|
||||||
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
|
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
|
||||||
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
|
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
|
||||||
|
|
|
@ -2508,6 +2508,11 @@ function group_update_listings($group_id)
|
||||||
|
|
||||||
if ($mod_permissions || $admin_permissions)
|
if ($mod_permissions || $admin_permissions)
|
||||||
{
|
{
|
||||||
|
if (!function_exists('update_foes'))
|
||||||
|
{
|
||||||
|
global $phpbb_root_path, $phpEx;
|
||||||
|
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
|
||||||
|
}
|
||||||
update_foes();
|
update_foes();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -372,7 +372,7 @@ class ucp_register
|
||||||
|
|
||||||
$messenger->assign_vars(array(
|
$messenger->assign_vars(array(
|
||||||
'USERNAME' => htmlspecialchars_decode($data['username']),
|
'USERNAME' => htmlspecialchars_decode($data['username']),
|
||||||
'U_USER_DETAILS' => "$server_url/memberlist.$phpEx?mode=viewprofile&u=$user_id",
|
'U_USER_DETAILS' => "$server_url/memberlist.$phpEx?mode=viewprofile&u=$user_id",
|
||||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
|
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -1421,7 +1421,7 @@ function add_bots()
|
||||||
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
|
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
|
||||||
'W3C [Validator]' => array('W3C_*Validator', ''),
|
'W3C [Validator]' => array('W3C_*Validator', ''),
|
||||||
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
|
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
|
||||||
'Yacy [Bot]' => array('yacybot', ''),
|
'YaCy [Bot]' => array('yacybot', ''),
|
||||||
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
|
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
|
||||||
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
|
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
|
||||||
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
|
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
|
||||||
|
|
|
@ -2325,7 +2325,7 @@ class install_install extends module
|
||||||
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
|
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
|
||||||
'W3C [Validator]' => array('W3C_*Validator', ''),
|
'W3C [Validator]' => array('W3C_*Validator', ''),
|
||||||
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
|
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
|
||||||
'Yacy [Bot]' => array('yacybot', ''),
|
'YaCy [Bot]' => array('yacybot', ''),
|
||||||
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
|
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
|
||||||
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
|
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
|
||||||
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
|
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
|
||||||
|
|
Loading…
Add table
Reference in a new issue