Merge branch 'pr/546' into develop

Author: iftakharul-islam

src/Task/Controllers/Task_Controller.php

@@ -1344,7 +1344,7 @@ public function load_more_tasks( WP_REST_Request $request ) {
             $task_ids = $this->get_incomplete_task_ids( [$list_id], $project_id, $task_ids );   
         }
 
-        $tasks = pm_get_tasks( [ 'id' => $task_ids ] );
+        $tasks = pm_get_tasks( [ 'id' => $task_ids, 'source' => 'more_tasks' ] );
 
         wp_send_json_success(
             [

src/Task/Helper/Task.php

@@ -1737,6 +1737,7 @@ private function get() {
 		global $wpdb;
 
 		$id        = isset( $this->query_params['id'] ) ? $this->query_params['id'] : false;
+		$more_tasks_request = isset( $this->query_params['source'] ) && 'more_tasks' === $this->query_params['source'] ? true : false;
 		$boardable = pm_tb_prefix() . 'pm_boardables';
 		$tasks = [];
 
@@ -1766,7 +1767,7 @@ private function get() {
 		$results = $wpdb->get_results( $query );
 
 		// If task has not boardable_id mean no list
-		if ( $id ) {
+		if ( $id && ! $more_tasks_request ) {
 			foreach ( $results as $key => $result ) {
 				if( $result->id == $id ) {
 					$tasks[] = $result;