Merge branch 'master' of github.com:DataTables/Editor-PHP

Author: AllanJard

Editor/Join.php

@@ -537,9 +537,6 @@ public function data($editor, &$data)
 				$stmt->order($this->order());
 			}
 
-			$stmt->left_join($this->_leftJoin);
-			$this->_apply_where($stmt);
-
 			if (isset($this->_join['table'])) {
 				// Working with a link table
 				$stmt
@@ -560,6 +557,9 @@ public function data($editor, &$data)
 					);
 			}
 
+			$stmt->left_join($this->_leftJoin);
+			$this->_apply_where($stmt);
+
 			// Check that the joining field is available.  The joining key can
 			// come from the Editor instance's primary key, or any other field,
 			// including a nested value (from a left join). If the instance's