makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 20:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

#12577

Browse source 
Don't allow users into bot mode to end the illusion of being able to log in as googlebot while keeping privileges (that really wasn't possible).


git-svn-id: file:///svn/phpbb/trunk@7785 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-06-20 14:24:02 +00:00
parent a0248584a6
commit 59ee46e2a9
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View file

@ -291,6 +291,8 @@ p a {
<li>[Fix] Allow searching for multibyte authors (Bug #11793)</li> <li>[Fix] Allow searching for multibyte authors (Bug #11793)</li>
<li>[Fix] Writing directories/files with correct permissions using FTP for transfers on PHP4</li> <li>[Fix] Writing directories/files with correct permissions using FTP for transfers on PHP4</li>
<li>[Fix] Oracle sequences during conversions are now corrected (Bug #12555)</li> <li>[Fix] Oracle sequences during conversions are now corrected (Bug #12555)</li>
<li>[Fix] Allow users to continue after selecting "No" in the merge quickmod confirmation (Bug #12577)</li>
</ul> </ul>
</div> </div>

7
phpBB/includes/mcp/mcp_forum.php
View file

@ -63,7 +63,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
} }
$selected_ids = ''; $selected_ids = '';
if (sizeof($post_id_list)) if (sizeof($post_id_list) && $action != 'merge_topics')
{ {
foreach ($post_id_list as $num => $post_id) foreach ($post_id_list as $num => $post_id)
{ {
@ -318,6 +318,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
{ {
global $db, $template, $user, $phpEx, $phpbb_root_path, $auth; global $db, $template, $user, $phpEx, $phpbb_root_path, $auth;
if (!sizeof($topic_ids))
{
$template->assign_var('MESSAGE', $user->lang['NO_TOPIC_SELECTED']);
return;
}
if (!$to_topic_id) if (!$to_topic_id)
{ {
$template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']); $template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']);

2
phpBB/includes/session.php
View file

@ -414,6 +414,7 @@ class session
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$this->data = $db->sql_fetchrow($result); $this->data = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
$bot = false;
} }
else if ($user_id !== false && !sizeof($this->data)) else if ($user_id !== false && !sizeof($this->data))
{ {
@ -427,6 +428,7 @@ class session
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$this->data = $db->sql_fetchrow($result); $this->data = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
$bot = false;
} }
// If no data was returned one or more of the following occurred: // If no data was returned one or more of the following occurred: