Don't treat tables that substring match as associations

The table structure of:

- packages
- userpackages
- georegions
- userpackages_georegions

Should not create a habtm between packages & georegions.

Fixes #3532

lib/Cake/Console/Command/Task/ModelTask.php

@@ -627,7 +627,7 @@ public function findHasAndBelongsToMany(Model $model, $associations) {
 			$offset = strpos($otherTable, $model->table . '_');
 			$otherOffset = strpos($otherTable, '_' . $model->table);
 
-			if ($offset !== false) {
+			if ($offset === 0) {
 				$offset = strlen($model->table . '_');
 				$habtmName = $this->_modelName(substr($otherTable, $offset));
 				$associations['hasAndBelongsToMany'][] = array(
@@ -637,7 +637,7 @@ public function findHasAndBelongsToMany(Model $model, $associations) {
 					'associationForeignKey' => $this->_modelKey($habtmName),
 					'joinTable' => $otherTable
 				);
-			} elseif ($otherOffset !== false) {
+			} elseif ($otherOffset === 0) {
 				$habtmName = $this->_modelName(substr($otherTable, 0, $otherOffset));
 				$associations['hasAndBelongsToMany'][] = array(
 					'alias' => $habtmName,