From baea29e2f0f3f9e990f801263a34a510fb64031c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sat, 22 Aug 2015 15:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=9C=80=E8=A6=81=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=A4=E6=AC=A1=E6=89=8D=E8=83=BD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb                           | 12 ++----------
 public/assets/kindeditor/kindeditor.js |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 1c77ff04b..9d07bbf24 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150820025358) do
+ActiveRecord::Schema.define(:version => 20150820004659) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1404,15 +1404,6 @@ ActiveRecord::Schema.define(:version => 20150820025358) do
     t.integer "fields_bits",                 :default => 0
   end
 
-  create_table "user_activities", :force => true do |t|
-    t.string   "act_type"
-    t.integer  "act_id"
-    t.string   "container_type"
-    t.integer  "container_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "user_extensions", :force => true do |t|
     t.integer  "user_id",                            :null => false
     t.date     "birthday"
@@ -1525,6 +1516,7 @@ ActiveRecord::Schema.define(:version => 20150820025358) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
+    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 270618522..98dfc470b 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5157,7 +5157,7 @@ KEditor.prototype = {
 					}
 				});
 			} else {
-				statusbar.last().css('visibility', 'hidden');
+				if(statusbar.last()) {statusbar.last().css('visibility', 'hidden');}
 			}
 		}
 		return self;