4 files changed, 18 insertions, 7 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4c15a4700f..ef6f2338c5 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.RC5';
+$updates_to_version = '3.0.RC6';
 
 // Return if we "just include it" to find out for which version the database update is responsuble for
 if (defined('IN_PHPBB') && defined('IN_INSTALL'))
@@ -983,7 +983,7 @@ if ($exit)
 </html>
 
 <?php
-	exit;
+	exit_handler();
 }
 
 // Schema updates
@@ -1502,6 +1502,17 @@ if (version_compare($current_version, '3.0.RC4', '<='))
 	$no_updates = false;
 }
 
+if (version_compare($current_version, '3.0.RC5', '<='))
+{
+	// In case the user is having the bot mediapartner google "as is", adjust it.
+	$sql = 'UPDATE ' . BOTS_TABLE . "
+		SET bot_agent = '" . $db->sql_escape('Mediapartners-Google') . "'
+		WHERE bot_agent = '" . $db->sql_escape('Mediapartners-Google/') . "'";
+	_sql($sql, $errored, $error_ary);
+
+	$no_updates = false;
+}
+
 _write_result($no_updates, $errored, $error_ary);
 
 $error_ary = array();
@@ -1604,7 +1615,7 @@ $cache->purge();
 
 <?php
 
-exit;
+exit_handler();
 
 
 /**
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 56da3590ff..c916ee9df4 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -415,7 +415,7 @@ class module
 			$db->sql_close();
 		}
 
-		exit;
+		exit_handler();
 	}
 
 	/**
@@ -606,7 +606,7 @@ class module
 			$db->sql_close();
 		}
 
-		exit;
+		exit_handler();
 	}
 
 	/**
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 4dd7e73db5..593f98d7bb 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2060,7 +2060,7 @@ class install_install extends module
 		'FAST WebCrawler [Crawler]'	=> array('FAST-WebCrawler/', ''),
 		'Francis [Bot]'				=> array('http://www.neomo.de/', ''),
 		'Gigabot [Bot]'				=> array('Gigabot/', ''),
-		'Google Adsense [Bot]'		=> array('Mediapartners-Google/', ''),
+		'Google Adsense [Bot]'		=> array('Mediapartners-Google', ''),
 		'Google Desktop'			=> array('Google Desktop', ''),
 		'Google Feedfetcher'		=> array('Feedfetcher-Google', ''),
 		'Google [Bot]'				=> array('Googlebot', ''),
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 4ea41610f1..b80dc5583f 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -208,7 +208,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC5');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC6-dev');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');