deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

<video> and x-sendfile

Browse source 
Using <object> and <embed> were forbidden for obvious
security reasons. Instiki now permits embedding video
via the HTML5 <video> element (Ogg/Theora encoded videos
only, with .ogg or .ogv extensions). You can even upload
videos with

    [[foo.ogg:video]]

Instiki now support x-sendfile. See the Proxying page for
configuring Apache (with the x-sendfile module). Lighttpd
should work similarly.

Update Rails to latest Edge (hopefully converging on RC2!).
This commit is contained in:
Jacques Distler 2009-03-02 02:32:25 -06:00
parent 133c21b801
commit 8ea8b6a8f7
45 changed files with 872 additions and 751 deletions
Download patch file Download diff file Expand all files Collapse all files

6
vendor/rails/actionpack/lib/action_view/base.rb vendored
View file

@ -183,12 +183,12 @@ module ActionView #:nodoc:
cattr_accessor :debug_rjs
# Specify whether templates should be cached. Otherwise the file we be read everytime it is accessed.
# Automaticaly reloading templates are not thread safe and should only be used in development mode.
@@cache_template_loading = false
# Automatically reloading templates are not thread safe and should only be used in development mode.
@@cache_template_loading = nil
cattr_accessor :cache_template_loading
def self.cache_template_loading?
ActionController::Base.allow_concurrency || cache_template_loading
ActionController::Base.allow_concurrency || (cache_template_loading.nil? ? !ActiveSupport::Dependencies.load? : cache_template_loading)
end
attr_internal :request