Merge r21872 and bump to rc21.10.0rc2

3 files changed, 9 insertions, 5 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index deb0cf3b2cec..f7155132e697 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,16 +3,20 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
-== MediaWiki 1.10.0 ==
+== MediaWiki 1.10.0rc2 ==
 
-??, ??
+May 4, 2007
+
+THIS IS A RELEASE CANDIDATE MADE AVAILABLE FOR TESTING!
+A FINAL 1.10.0 RELEASE WILL APPEAR WITHIN A FEW DAYS.
 
 Changes since 1.10.0RC1:
 * Various l10n fixes and updates
 * Fix for upgrade of page_restrictions table
 * (bug 9780) Fix normalization of titles with initial colon followed by whitespace
 * Fix for regression in upload: wrong size info saved into image table
-
+* Avoid cyclic stub problems when authorization hooks do funny things with
+  the user and the database at load time
 
 == MediaWiki 1.10.0RC1 ==
 
diff --git a/includes/Database.php b/includes/Database.php
index ef18a6de2a4e..3fd6ad169cb8 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -709,7 +709,7 @@ class Database {
 		# Add a comment for easy SHOW PROCESSLIST interpretation
 		#if ( $fname ) {
 			global $wgUser;
-			if ( is_object( $wgUser ) ) {
+			if ( is_object( $wgUser ) && !($wgUser instanceof StubObject) ) {
 				$userName = $wgUser->getName();
 				if ( strlen( $userName ) > 15 ) {
 					$userName = substr( $userName, 0, 15 ) . '...';
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 29f657c2070a..d8a2fd8468e1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -31,7 +31,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.10.0rc1';
+$wgVersion			= '1.10.0rc2';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';