Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: not permitted theme params when importing theme" 

This reverts commit 813df1a3fb.
This commit is contained in:
Joffrey JAFFEUX 2017-12-14 11:40:14 +01:00
parent 041deac67a
commit 001abfc4cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admin/themes_controller.rb
View File

@ -26,13 +26,13 @@ class Admin::ThemesController < Admin::AdminController
def import def import
@theme = nil @theme = nil
uploaded_theme = params.require(:theme) if params[:theme]
if uploaded_theme json = JSON::parse(params[:theme].read)
json = JSON::parse(uploaded_theme.read)
theme = json['theme'] theme = json['theme']
@theme = Theme.new(name: theme["name"], user_id: current_user.id) @theme = Theme.new(name: theme["name"], user_id: current_user.id)
theme["theme_fields"]&.each do |field| theme["theme_fields"]&.each do |field|
if field["raw_upload"] if field["raw_upload"]
begin begin
tmp = Tempfile.new tmp = Tempfile.new