diff --git a/app/controllers/admin/galleries_controller.rb b/app/controllers/admin/galleries_controller.rb
index 6c00e66..f040529 100644
--- a/app/controllers/admin/galleries_controller.rb
+++ b/app/controllers/admin/galleries_controller.rb
@@ -52,9 +52,9 @@ class Admin::GalleriesController < OrbitAdminController
text = album.tags.collect do |tag|
"
#{tag.name}"
end.join
- render :text => text
+ render :plain => text
else
- render :text => ''
+ render :plain => ''
end
end
def rotate_images
@@ -261,7 +261,7 @@ class Admin::GalleriesController < OrbitAdminController
variable.progress_filename = ''
variable.notalive = true
variable.save!
- render :text => ''
+ render :plain => ''
end
def recreate_progress
progress_percent = AlbumVariable.first.progress_percent rescue '0%'
diff --git a/app/models/album.rb b/app/models/album.rb
index cc2fc46..5c6408c 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -54,7 +54,7 @@ class Album
(tmp.blank? ? (AlbumSetting.first.resize_gravity.blank? ? "Center" : AlbumSetting.first.resize_gravity) : tmp) rescue 'Center'
end
def self.find_by_param(input)
- self.find_by(uid: input)
+ self.find_by(uid: input.to_s)
end
def self.filter_by_tags(tags=[])
tags = OrbitHelper.page_tags if tags.blank?