From 81b0e3c38f4bbbcc511e81792547fce1ccf4ac01 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Thu, 27 Dec 2012 12:14:59 +0800 Subject: [PATCH 1/3] change ActiveSupport::SecureRandom to SecureRandom in orbit core --- app/helpers/admin/ad_banners_helper.rb | 2 +- lib/orbit_core_lib.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/admin/ad_banners_helper.rb b/app/helpers/admin/ad_banners_helper.rb index df0d3e73..b97f49cd 100644 --- a/app/helpers/admin/ad_banners_helper.rb +++ b/app/helpers/admin/ad_banners_helper.rb @@ -28,4 +28,4 @@ module Admin::AdBannersHelper -end \ No newline at end of file +end diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb index 3abeeddd..4f1e6fd2 100644 --- a/lib/orbit_core_lib.rb +++ b/lib/orbit_core_lib.rb @@ -140,7 +140,7 @@ module OrbitCoreLib protected def generate_token - self.s_token = ActiveSupport::SecureRandom.hex(16) + self.s_token = SecureRandom.hex(16) self.save! end end From 177a409508d53bc8e61512584dc68aecfa2adf60 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Thu, 27 Dec 2012 10:38:27 +0800 Subject: [PATCH 2/3] fixed search_bar placeholder --- app/views/layouts/_orbit_bar.html.erb | 156 +++++++++++++------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index e7de0ebc..d14a3d5d 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -1,83 +1,83 @@