aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/acp/auth.php8
-rw-r--r--phpBB/includes/functions_convert.php2
-rw-r--r--phpBB/includes/functions_user.php5
-rw-r--r--phpBB/includes/ucp/ucp_register.php2
-rw-r--r--phpBB/install/database_update.php2
-rwxr-xr-xphpBB/install/install_install.php2
6 files changed, 16 insertions, 5 deletions
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index b32d435d7b..375a9c9ba3 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -264,7 +264,7 @@ class auth_admin extends auth
{
$hold_ary[$row['forum_id']]['groups'][] = $row['group_id'];
}
- $db->sql_freeresult($result);
+ $db->sql_freeresult($result);
return $hold_ary;
}
@@ -620,6 +620,12 @@ class auth_admin extends auth
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(
'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_names[$forum_id],
'FORUM_ID' => $forum_id)
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index ab903ac2ad..e96cf5aaf1 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1701,7 +1701,7 @@ function add_bots()
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
'W3C [Validator]' => array('W3C_*Validator', ''),
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
- 'Yacy [Bot]' => array('yacybot', ''),
+ 'YaCy [Bot]' => array('yacybot', ''),
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 933124ce28..3ef03ece67 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2508,6 +2508,11 @@ function group_update_listings($group_id)
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();
}
}
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 9fffdff5fd..4d42cbd344 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -372,7 +372,7 @@ class ucp_register
$messenger->assign_vars(array(
'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")
);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 666cb1aad3..7818e4ef90 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1421,7 +1421,7 @@ function add_bots()
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
'W3C [Validator]' => array('W3C_*Validator', ''),
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
- 'Yacy [Bot]' => array('yacybot', ''),
+ 'YaCy [Bot]' => array('yacybot', ''),
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index ba80f40eb2..79fd828784 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2325,7 +2325,7 @@ class install_install extends module
'W3C [Linkcheck]' => array('W3C-checklink/', ''),
'W3C [Validator]' => array('W3C_*Validator', ''),
'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''),
- 'Yacy [Bot]' => array('yacybot', ''),
+ 'YaCy [Bot]' => array('yacybot', ''),
'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''),
'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''),
'Yahoo [Bot]' => array('Yahoo! Slurp', ''),