From c8299697d0703e15b612bb0f9f858efe97da0fd0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 25 Jun 2014 21:03:48 +0400
Subject: [PATCH] Correct fix for #4060

---
 apps/advanced/common/models/User.php              | 8 ++++++++
 extensions/gii/generators/crud/default/search.php | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php
index b1cf75fa16..b2145cce47 100644
--- a/apps/advanced/common/models/User.php
+++ b/apps/advanced/common/models/User.php
@@ -28,6 +28,14 @@ class User extends ActiveRecord implements IdentityInterface
 
     const ROLE_USER = 10;
 
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%user}}';
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/extensions/gii/generators/crud/default/search.php b/extensions/gii/generators/crud/default/search.php
index e94d0a63dd..f518365783 100644
--- a/extensions/gii/generators/crud/default/search.php
+++ b/extensions/gii/generators/crud/default/search.php
@@ -35,14 +35,6 @@ use <?= ltrim($generator->modelClass, '\\') . (isset($modelAlias) ? " as $modelA
 class <?= $searchModelClass ?> extends <?= isset($modelAlias) ? $modelAlias : $modelClass ?>
 
 {
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return <?= isset($modelAlias) ? $modelAlias : $modelClass ?>::tableName();
-    }
-
     /**
      * @inheritdoc
      */