diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-20 14:24:02 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-20 14:24:02 +0000 |
| commit | 59ee46e2a963492f53cc78189b5020536338986d (patch) | |
| tree | 9f3767155ad934bbbf60de8ab8e08885484ad310 /phpBB | |
| parent | a0248584a6aaa2334ae54c2f145500b9b0a6d6a0 (diff) | |
| download | forums-59ee46e2a963492f53cc78189b5020536338986d.tar forums-59ee46e2a963492f53cc78189b5020536338986d.tar.gz forums-59ee46e2a963492f53cc78189b5020536338986d.tar.bz2 forums-59ee46e2a963492f53cc78189b5020536338986d.tar.xz forums-59ee46e2a963492f53cc78189b5020536338986d.zip | |
#12577
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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ab863d7fc6..eec7dabf40 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -291,6 +291,8 @@ p a { <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] 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> </div> diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 4387e02739..0578170d7b 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -63,7 +63,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) } $selected_ids = ''; - if (sizeof($post_id_list)) + if (sizeof($post_id_list) && $action != 'merge_topics') { 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; + if (!sizeof($topic_ids)) + { + $template->assign_var('MESSAGE', $user->lang['NO_TOPIC_SELECTED']); + return; + } if (!$to_topic_id) { $template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']); diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 29d364e89b..ec43c02bc9 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -414,6 +414,7 @@ class session $result = $db->sql_query($sql); $this->data = $db->sql_fetchrow($result); $db->sql_freeresult($result); + $bot = false; } else if ($user_id !== false && !sizeof($this->data)) { @@ -427,8 +428,9 @@ class session $result = $db->sql_query($sql); $this->data = $db->sql_fetchrow($result); $db->sql_freeresult($result); + $bot = false; } - + // If no data was returned one or more of the following occurred: // Key didn't match one in the DB // User does not exist |