[myexperiment-hackers] [2753] branches/rails2/vendor/plugins/fckeditor: fixes for relative_url_rootfixes for relative_url_root

[noreply]

Revision

2753

Author

dgc

Date

2011-10-24 17:02:54 -0400 (Mon, 24 Oct 2011)

Log Message

fixes for relative_url_rootfixes for relative_url_root

Modified Paths

• branches/rails2/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb
• branches/rails2/vendor/plugins/fckeditor/lib/fckeditor.rb

Diff

Modified: branches/rails2/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb (2752 => 2753)

--- branches/rails2/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb	2011-10-24 21:02:23 UTC (rev 2752)
+++ branches/rails2/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb	2011-10-24 21:02:54 UTC (rev 2753)
@@ -133,7 +133,7 @@
   end
   
   def upload_directory_path
-    uploaded = request.relative_url_root.to_s+"#{UPLOADED}/#{params[:Type]}"
+    uploaded = ActionController::Base.relative_url_root.to_s+"#{UPLOADED}/#{params[:Type]}"
     "#{uploaded}#{params[:CurrentFolder]}"
   end
   

Modified: branches/rails2/vendor/plugins/fckeditor/lib/fckeditor.rb (2752 => 2753)

--- branches/rails2/vendor/plugins/fckeditor/lib/fckeditor.rb	2011-10-24 21:02:23 UTC (rev 2752)
+++ branches/rails2/vendor/plugins/fckeditor/lib/fckeditor.rb	2011-10-24 21:02:54 UTC (rev 2753)
@@ -35,7 +35,7 @@
         inputs = "<textarea id='#{id}' #{cols} #{rows} name='#{object}[#{field}]'>#{value}</textarea>\n"
       end
       
-      js_path = "#{request.relative_url_root}/_javascript_s"
+      js_path = "#{ActionController::Base.relative_url_root}/_javascript_s"
       base_path = "#{js_path}/fckeditor/"
       return inputs <<
         _javascript__tag("var oFCKeditor = new FCKeditor('#{id}', '#{width}', '#{height}', '#{toolbarSet}');\n" <<