Merge branch 'development'

Author: ikolarov

config.php

@@ -4,7 +4,7 @@
 
 # Define version constant
 if ( ! defined( __NAMESPACE__ . '\VERSION' ) ) {
-	define( __NAMESPACE__ . '\VERSION', '3.6.8' );
+	define( __NAMESPACE__ . '\VERSION', '3.6.9' );
 }
 
 # Define root directory

core/Service/Meta_Query_Service.php

@@ -100,11 +100,14 @@ protected function get_meta_key_replace_regex() {
 	}
 
 	public function filter_get_meta_sql( $sql ) {
-		if ( strpos( $sql['where'], static::META_KEY_PREFIX ) !== false ) {
-			$sql['where'] = preg_replace( $this->get_meta_key_replace_regex(), '$1 LIKE $2', $sql['where'] );
-		}
-		return $sql;
-	}
+        if ( strpos( $sql['where'], static::META_KEY_PREFIX ) !== false ) {
+            $sql['where'] = preg_replace( $this->get_meta_key_replace_regex(), '$1 LIKE $2', $sql['where'] );
+        }
+        if ( strpos( $sql['join'], static::META_KEY_PREFIX ) !== false ) {
+            $sql['join'] = str_replace( static::META_KEY_PREFIX, '', $sql['join'] );
+        }
+        return $sql;
+    }
 
 	/**************************************************
 	 * WP_QUERY                                       *

package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-fields",
-  "version": "3.6.8",
+  "version": "3.6.9",
   "description": "WordPress developer-friendly custom fields for post types, taxonomy terms, users, comments, widgets, options, navigation menus and more.",
   "directories": {
     "test": "tests"