Merge pull request #336 from Ultimate-Multisite/add-tests-and-compat-fix

Add comprehensive test suite and fix main site compat

Author: superdav42

composer.json

@@ -2,7 +2,7 @@
     "name": "devstone/ultimate-multisite",
     "homepage": "https://UltimateMultisite.com",
     "description": "The Multisite Website as a Service (WaaS) plugin.",
-    "version": "2.4.11-beta.4",
+    "version": "2.4.11-beta.3",
     "authors": [
         {
             "name": "Arindo Duque",

inc/class-wp-ultimo.php

@@ -31,7 +31,7 @@ final class WP_Ultimo {
 	 * @since 2.1.0
 	 * @var string
 	 */
-	const VERSION = '2.4.11-beta.4';
+	const VERSION = '2.4.11-beta.3';
 
 	/**
 	 * Core log handle for Ultimate Multisite.

inc/compat/class-multiple-accounts-compat.php

@@ -423,6 +423,12 @@ public function fix_login($user, $username, $password) {
 			return $user;
 		}
 
+		// On the main site, we don't need to scope email lookups
+		// to a specific sub-site. Let WordPress handle it normally.
+		if (is_main_site()) {
+			return $user;
+		}
+
 		// Sets the right user to be returned;
 		$user = $this->get_right_user($username, $password);