Applying query options before triggering beforeFind

cakephp · Aug 11, 2013 · d30757f · d30757f
1 parent e0cad2a
commit d30757f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/Cake/ORM/Table.php b/lib/Cake/ORM/Table.php
@@ -502,14 +502,13 @@ public function belongsToMany($associated, array $options = []) {
  */
 	public function find($type, $options = []) {
 		$query = $this->_buildQuery();
-		$query->select();
+		$query->select()->applyOptions($options);
 
 		$event = new Event('Model.beforeFind', $this, [$query, $options]);
 		$this->_eventManager->dispatch($event);
 		if ($event->isStopped()) {
 			return $query;
 		}
-		$query->applyOptions($options);
 		return $this->{'find' . ucfirst($type)}($query, $options);
 	}