From d92a23536c29c6285e9594e8e096c951f88b4b34 Mon Sep 17 00:00:00 2001
From: Thiago Talma <thiago@thiagomt.com>
Date: Thu, 23 Jan 2014 18:03:30 -0200
Subject: [PATCH] Ensure that the table prefix is used when generating the
 class name.

---
 extensions/gii/generators/model/Generator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/gii/generators/model/Generator.php b/extensions/gii/generators/model/Generator.php
index 453b4b7f05..3875f3d5f2 100644
--- a/extensions/gii/generators/model/Generator.php
+++ b/extensions/gii/generators/model/Generator.php
@@ -543,6 +543,8 @@ class Generator extends \yii\gii\Generator
 
 		$db = $this->getDbConnection();
 		$patterns = [];
+		$patterns[] = "/^{$db->tablePrefix}(.*?)$/";
+		$patterns[] = "/^(.*?){$db->tablePrefix}$/";
 		if (strpos($this->tableName, '*') !== false) {
 			$pattern = $this->tableName;
 			if (($pos = strrpos($pattern, '.')) !== false) {
@@ -550,8 +552,6 @@ class Generator extends \yii\gii\Generator
 			}
 			$patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
 		}
-		$patterns[] = "/^{$db->tablePrefix}(.*?)$/";
-		$patterns[] = "/^(.*?){$db->tablePrefix}$/";
 		$className = $tableName;
 		foreach ($patterns as $pattern) {
 			if (preg_match($pattern, $tableName, $matches)) {