Further Compatibility fixes for Redmine 1.1/backward compatibility

1) Allow the csrf_meta_tag() in popup.erb to fail gracefully, since
version skew in the Rails installation on some Debian platforms causes
this operation to fail (complaining about a missing String#html_safe).

2) Also in popup.erb, if helper function "javascript_heads" not
defined (it isn't in Redmine 1.1), simply use "javascript_include_tag"
to get javascript included.

Author: kubitron

Diff for: app/views/layouts/popup.erb

@@ -4,11 +4,11 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
-<%= csrf_meta_tag %>
+<%= begin csrf_meta_tag; rescue; "" end %>
 <%= favicon %>
 <%= stylesheet_link_tag 'application', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-<%= javascript_heads %>
+<%= defined?(javascript_heads)? javascript_heads : javascript_include_tag(:defaults) %>
 <%= heads_for_theme %>
 <!--[if IE 6]>
 <style type="text/css">