Merge branch 'master' into upstream-master (big-o team branch)

code/GoogleSitemap.php

@@ -102,6 +102,13 @@ class GoogleSitemap extends Controller {
 		unset(self::$dataobjects[$className]);
 	}
 
+	/**
+	 * Clears registered dataobjects. Useful for unit tests.
+	 */
+	public static function clear_registered_dataobjects() {
+		self::$dataobjects = array();
+	}
+
 	/**
 	 * Returns a list containing each viewable {@link DataObject} instance of 
 	 * the registered class names.

tests/GoogleSitemapTest.php

@@ -27,6 +27,12 @@ class GoogleSitemapTest extends FunctionalTest {
 		GoogleSitemap::unregister_dataobject('GoogleSitemapTest_UnviewableDataObject');
 	}
 
+	public function tearDown() {
+		parent::tearDown();
+
+		GoogleSitemap::clear_registered_dataobjects();
+	}
+
 	public function testItems() {
 		$sitemap = new GoogleSitemap();