Merge pull request #8 from mecachisenros/minor-fixes

Minor fixes
christianwach · Feb 4, 2020 · 23906c6 · 23906c6
2 parents c756dc2 + f55356e
commit 23906c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/wp-rest/Autoloader.php b/wp-rest/Autoloader.php
@@ -93,10 +93,10 @@ private function register_autoloader() {
 	 */
 	private function autoload( $class_name ) {
 
-		if ( false === strpos( $class_name, $this->namespace ) ) return;
-
 		$parts = explode( '\\', $class_name );
 
+		if ( $this->namespace !== $parts[0] ) return;
+
 		// remove namespace and join class path
 		$class_path = str_replace( '_', '-', implode( DIRECTORY_SEPARATOR, array_slice( $parts, 1 ) ) );
 

diff --git a/wp-rest/Controller/Rest.php b/wp-rest/Controller/Rest.php
@@ -519,7 +519,7 @@ protected function get_wp_user( int $contact_id ) {
 
 			// If this fails, get it from config.
 			if ( $domain_id === 0 ) {
-				$domain_id = CRM_Core_Config::domainID();
+				$domain_id = \CRM_Core_Config::domainID();
 			}
 
 			// Call API.

diff --git a/wp-rest/Controller/Url.php b/wp-rest/Controller/Url.php
@@ -124,6 +124,8 @@ protected function parse_url( $url, $params ) {
 
 		}
 
+		if ( strpos( $url, 'mailto' ) ) $url = strstr( $url, 'mailto' );
+
 		return apply_filters( 'civi_wp_rest/controller/url/parsed_url', $url, $params );
 
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,8 @@ protected function parse_url( $url, $params ) { @@
     		}
+    		if ( strpos( $url, 'mailto' ) ) $url = strstr( $url, 'mailto' );
     		return apply_filters( 'civi_wp_rest/controller/url/parsed_url', $url, $params );
     	}
@@ Expand Down @@