From cdfbcd925c7061559a2fec4cfe5ffa5785765ec4 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 9 Jan 2014 09:17:09 +0400
Subject: [PATCH] gii additional table prefix fixes

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

diff --git a/extensions/yii/gii/generators/model/Generator.php b/extensions/yii/gii/generators/model/Generator.php
index 785d311..b234b47 100644
--- a/extensions/yii/gii/generators/model/Generator.php
+++ b/extensions/yii/gii/generators/model/Generator.php
@@ -550,13 +550,8 @@ class Generator extends \yii\gii\Generator
 			}
 			$patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
 		}
-		if (!empty($db->tablePrefix)) {
-			$patterns[] = "/^{$db->tablePrefix}(.*?)$/";
-			$patterns[] = "/^(.*?){$db->tablePrefix}$/";
-		} else {
-			$patterns[] = "/^tbl_(.*?)$/";
-		}
-
+		$patterns[] = "/^{$db->tablePrefix}(.*?)$/";
+		$patterns[] = "/^(.*?){$db->tablePrefix}$/";
 		$className = $tableName;
 		foreach ($patterns as $pattern) {
 			if (preg_match($pattern, $tableName, $matches)) {