tagged version 0.8.1

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/0.8.1@2471 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-15 09:27:21 +00:00
97 changed files with 162 additions and 894 deletions
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -35,10 +35,6 @@ class AccountController < ApplicationController
    events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
    @events_by_day = events.group_by(&:event_date)
    
-    if @user != User.current && !User.current.admin? && @memberships.empty? && events.empty?
-      render_404 and return
-    end
-    
  rescue ActiveRecord::RecordNotFound
    render_404
  end
@@ -67,7 +63,6 @@ class AccountController < ApplicationController
          token = Token.create(:user => user, :action => 'autologin')
          cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
        end
-        call_hook(:controller_account_success_authentication_after, {:user => user })
        redirect_back_or_default :controller => 'my', :action => 'page'
      end
    end
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -46,7 +46,6 @@ class CustomFieldsController < ApplicationController
    end  
    if request.post? and @custom_field.save
      flash[:notice] = l(:notice_successful_create)
-      call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
      redirect_to :action => 'list', :tab => @custom_field.class.name
    end
    @trackers = Tracker.find(:all, :order => 'position')
@@ -59,7 +58,6 @@ class CustomFieldsController < ApplicationController
        @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
      end
      flash[:notice] = l(:notice_successful_update)
-      call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
      redirect_to :action => 'list', :tab => @custom_field.class.name
    end
    @trackers = Tracker.find(:all, :order => 'position')
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -23,7 +23,7 @@ class IssuesController < ApplicationController
  before_filter :find_project, :only => [:new, :update_form, :preview]
  before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu]
  before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
-  accept_key_auth :index, :show, :changes
+  accept_key_auth :index, :changes

  helper :journals
  helper :projects
@@ -43,10 +43,6 @@ class IssuesController < ApplicationController
  helper :timelog
  include Redmine::Export::PDF

-  verify :method => :post,
-         :only => :destroy,
-         :render => { :nothing => true, :status => :method_not_allowed }
-           
  def index
    retrieve_query
    sort_init 'id', 'desc'
@@ -151,7 +147,6 @@ class IssuesController < ApplicationController
        attach_files(@issue, params[:attachments])
        flash[:notice] = l(:notice_successful_create)
        Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
-        call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
        redirect_to(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } :
                                        { :action => 'show', :id => @issue })
        return
@@ -199,7 +194,6 @@ class IssuesController < ApplicationController
          flash[:notice] = l(:notice_successful_update)
          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
        end
-        call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
        redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
      end
    end
@@ -349,12 +343,10 @@ class IssuesController < ApplicationController
      @gantt.events = events
    end
    
-    basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
-    
    respond_to do |format|
      format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
-      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
-      format.pdf  { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") }
+      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png") } if @gantt.respond_to?('to_image')
+      format.pdf  { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.pdf") }
    end
  end
  
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -46,7 +46,6 @@ class MessagesController < ApplicationController
      @message.sticky = params[:message]['sticky']
    end
    if request.post? && @message.save
-      call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
      attach_files(@message, params[:attachments])
      redirect_to :action => 'show', :id => @message
    end
@@ -59,7 +58,6 @@ class MessagesController < ApplicationController
    @reply.board = @board
    @topic.children << @reply
    if !@reply.new_record?
-      call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
      attach_files(@reply, params[:attachments])
    end
    redirect_to :action => 'show', :id => @topic
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -65,7 +65,6 @@ class NewsController < ApplicationController
      flash[:notice] = l(:label_comment_added)
      redirect_to :action => 'show', :id => @news
    else
-      show
      render :action => 'show'
    end
  end
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -197,9 +197,6 @@ class TimelogController < ApplicationController
    render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
    @time_entry.attributes = params[:time_entry]
-    
-    call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
-    
    if request.post? and @time_entry.save
      flash[:notice] = l(:notice_successful_update)
      redirect_back_or_default :action => 'details', :project_id => @time_entry.project
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -75,11 +75,7 @@ class UsersController < ApplicationController
      @user.admin = params[:user][:admin] if params[:user][:admin]
      @user.login = params[:user][:login] if params[:user][:login]
      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
-      @user.attributes = params[:user]
-      # Was the account actived ? (do it before User#save clears the change)
-      was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
-      if @user.save
-        Mailer.deliver_account_activated(@user) if was_activated
+      if @user.update_attributes(params[:user])
        flash[:notice] = l(:notice_successful_update)
        # Give a string to redirect_to otherwise it would use status param as the response code
        redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -82,7 +82,6 @@ class WikiController < ApplicationController
      @content.author = User.current
      # if page is new @page.save will also save content, but not if page isn't a new record
      if (@page.new_record? ? @page.save : @content.save)
-        call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
        redirect_to :action => 'index', :id => @project, :page => @page.title
      end
    end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -159,7 +159,7 @@ module ApplicationHelper

  # Truncates and returns the string as a single line
  def truncate_single_line(string, *args)
-    truncate(string.to_s, *args).gsub(%r{[\r\n]+}m, ' ')
+    truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
  end

  def html_hours(text)
@@ -385,7 +385,7 @@ module ApplicationHelper
    #     export:some/file -> Force the download of the file
    #  Forum messages:
    #     message#1218 -> Link to message with id 1218
-    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|<|$)}) do |m|
+    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
      leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
      link = nil
      if esc.nil?
@@ -487,11 +487,11 @@ module ApplicationHelper
      full_messages = []
      object.errors.each do |attr, msg|
        next if msg.nil?
-        msg = [msg] unless msg.is_a?(Array)
+        msg = msg.first if msg.is_a? Array
        if attr == "base"
-          full_messages << l(*msg)
+          full_messages << l(msg)
        else
-          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(*msg) unless attr == "custom_values"
+          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
        end
      end
      # retrieve custom values error messages
@@ -499,8 +499,8 @@ module ApplicationHelper
        object.custom_values.each do |v|
          v.errors.each do |attr, msg|
            next if msg.nil?
-            msg = [msg] unless msg.is_a?(Array)
-            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(*msg)
+            msg = msg.first if msg.is_a? Array
+            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
          end
        end
      end
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -38,8 +38,6 @@ module IssuesHelper
    s = "issue status-#{issue.status.position} priority-#{issue.priority.position}"
    s << ' closed' if issue.closed?
    s << ' overdue' if issue.overdue?
-    s << ' created-by-me' if User.current.logged? && issue.author_id == User.current.id
-    s << ' assigned-to-me' if User.current.logged? && issue.assigned_to_id == User.current.id
    s
  end
  
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -40,14 +40,8 @@ module QueriesHelper
      else
        case column.name
        when :subject
-        h((!@project.nil? && @project != issue.project) ? "#{issue.project.name} - " : '') +
+        h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
          link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
-        when :project
-          link_to(h(value), :controller => 'projects', :action => 'show', :id => value)
-        when :assigned_to
-          link_to(h(value), :controller => 'account', :action => 'show', :id => value)
-        when :author
-          link_to(h(value), :controller => 'account', :action => 'show', :id => value)
        when :done_ratio
          progress_bar(value, :width => '80px')
        when :fixed_version
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -147,7 +147,7 @@ module RepositoriesHelper

  def subversion_field_tags(form, repository)
      content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
-                       '<br />(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
+                       '<br />(http://, https://, svn://, file:///)') +
      content_tag('p', form.text_field(:login, :size => 30)) +
      content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
                                           :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -35,11 +35,7 @@ module TimelogHelper
  end
  
  def select_hours(data, criteria, value)
-  	if value.to_s.empty?
-  		data.select {|row| row[criteria].blank? }
-    else 
-    	data.select {|row| row[criteria] == value}
-    end
+    data.select {|row| row[criteria] == value}
  end
  
  def sum_hours(data)
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -36,7 +36,7 @@ module WikiHelper
          words_add += 1
        else
          del_at = pos unless del_at
-          deleted << ' ' + h(change[2])
+          deleted << ' ' + change[2]
          words_del	 += 1
        end
      end
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -33,7 +33,7 @@ class Attachment < ActiveRecord::Base
                            :author_key => :author_id,
                            :find_options => {:select => "#{Attachment.table_name}.*", 
                                              :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
-                                                        "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.id )"}
+                                                        "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id"}
  
  acts_as_activity_provider :type => 'documents',
                            :permission => :view_documents,
@@ -65,20 +65,14 @@ class Attachment < ActiveRecord::Base
    nil
  end

-  # Copies the temporary file to its final location
-  # and computes its MD5 hash
+  # Copy temp file to its final location
  def before_save
    if @temp_file && (@temp_file.size > 0)
      logger.debug("saving '#{self.diskfile}'")
-      md5 = Digest::MD5.new
      File.open(diskfile, "wb") do |f| 
-        buffer = ""
-        while (buffer = @temp_file.read(8192))
-          f.write(buffer)
-          md5.update(buffer)
-        end
+        f.write(@temp_file.read)
      end
-      self.digest = md5.hexdigest
+      self.digest = self.class.digest(diskfile)
    end
    # Don't save the content type if it's longer than the authorized length
    if self.content_type && self.content_type.length > 255
@@ -147,4 +141,11 @@ private
    end
    df
  end
+  
+  # Returns the MD5 digest of the file at given path
+  def self.digest(filename)
+    File.open(filename, 'rb') do |f|
+      Digest::MD5.hexdigest(f.read)
+    end
+  end
 end
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -112,8 +112,6 @@ class Changeset < ActiveRecord::Base
          journal = issue.init_journal(user || User.anonymous, l(:text_status_changed_by_changeset, csettext))
          issue.status = fix_status
          issue.done_ratio = done_ratio if done_ratio
-          Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
-                                  { :changeset => self, :issue => issue })
          issue.save
          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
        end
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -38,7 +38,7 @@ class Journal < ActiveRecord::Base
                                              :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
                                                             " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
  
-  def save(*args)
+  def save
    # Do not save an empty journal
    (details.empty? && notes.blank?) ? false : super
  end
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -40,7 +40,7 @@ class MailHandler < ActionMailer::Base
  # Processes incoming emails
  def receive(email)
    @email = email
-    @user = User.active.find(:first, :conditions => ["LOWER(mail) = ?", email.from.to_a.first.to_s.strip.downcase])
+    @user = User.active.find(:first, :conditions => ["LOWER(mail) = ?", email.from.first.to_s.strip.downcase])
    unless @user
      # Unknown user => the email is ignored
      # TODO: ability to create the user's account
@@ -163,17 +163,10 @@ class MailHandler < ActionMailer::Base
  end
  
  def get_keyword(attr, options={})
-    @keywords ||= {}
-    if @keywords.has_key?(attr)
-      @keywords[attr]
-    else
-      @keywords[attr] = begin
-        if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body.gsub!(/^#{attr}[ \t]*:[ \t]*(.+)\s*$/i, '')
-          $1.strip
-        elsif !@@handler_options[:issue][attr].blank?
-          @@handler_options[:issue][attr]
-        end
-      end
+    if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body =~ /^#{attr}:[ \t]*(.+)$/i
+      $1.strip
+    elsif !@@handler_options[:issue][attr].blank?
+      @@handler_options[:issue][attr]
    end
  end
  
@@ -195,6 +188,5 @@ class MailHandler < ActionMailer::Base
      @plain_text_body = plain_text_part.body.to_s
    end
    @plain_text_body.strip!
-    @plain_text_body
  end
 end
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -22,12 +22,6 @@ class Mailer < ActionMailer::Base

  include ActionController::UrlWriter

-  def self.default_url_options
-    h = Setting.host_name
-    h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
-    { :host => h, :protocol => Setting.protocol }
-  end
-  
  def issue_add(issue)
    redmine_headers 'Project' => issue.project.identifier,
                    'Issue-Id' => issue.id,
@@ -133,15 +127,6 @@ class Mailer < ActionMailer::Base
         :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
  end

-  # A registered user's account was activated by an administrator
-  def account_activated(user)
-    set_language_if_valid user.language
-    recipients user.mail
-    subject l(:mail_subject_register, Setting.app_title)
-    body :user => user,
-         :login_url => url_for(:controller => 'account', :action => 'login')
-  end
-
  def lost_password(token)
    set_language_if_valid(token.user.language)
    recipients token.user.mail
@@ -204,12 +189,16 @@ class Mailer < ActionMailer::Base
    set_language_if_valid Setting.default_language
    from Setting.mail_from
    
+    # URL options
+    h = Setting.host_name
+    h = h.to_s.gsub(%r{\/.*$}, '') unless ActionController::AbstractRequest.relative_url_root.blank?
+    default_url_options[:host] = h
+    default_url_options[:protocol] = Setting.protocol
+    
    # Common headers
    headers 'X-Mailer' => 'Redmine',
            'X-Redmine-Host' => Setting.host_name,
-            'X-Redmine-Site' => Setting.app_title,
-            'Precedence' => 'bulk',
-            'Auto-Submitted' => 'auto-generated'
+            'X-Redmine-Site' => Setting.app_title
  end

  # Appends a Redmine header field (name is prepended with 'X-Redmine-')
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -24,7 +24,7 @@ class News < ActiveRecord::Base
  validates_length_of :title, :maximum => 60
  validates_length_of :summary, :maximum => 255

-  acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project
+  acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
  acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
  acts_as_activity_provider :find_options => {:include => [:project, :author]},
                            :author_key => :author_id
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -60,7 +60,7 @@ class Project < ActiveRecord::Base
  validates_associated :repository, :wiki
  validates_length_of :name, :maximum => 30
  validates_length_of :homepage, :maximum => 255
-  validates_length_of :identifier, :in => 1..20
+  validates_length_of :identifier, :in => 2..20
  validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
  
  before_destroy :delete_all_members
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -93,7 +93,6 @@ class Query < ActiveRecord::Base
  cattr_reader :operators_by_filter_type

  @@available_columns = [
-    QueryColumn.new(:project, :sortable => "#{Project.table_name}.name"),
    QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
    QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
    QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position", :default_order => 'desc'),
@@ -235,10 +234,7 @@ class Query < ActiveRecord::Base
  
  def columns
    if has_default_columns?
-      available_columns.select do |c|
-        # Adds the project column by default for cross-project lists
-        Setting.issue_list_default_columns.include?(c.name.to_s) || (c.name == :project && project.nil?)
-      end
+      available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
    else
      # preserve the column_names order
      column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
@@ -368,9 +364,9 @@ class Query < ActiveRecord::Base
        Time.now.at_beginning_of_week
      sql = "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
    when "~"
-      sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
+      sql = "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(value.first)}%'"
    when "!~"
-      sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
+      sql = "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(value.first)}%'"
    end
    
    return sql
--- a/app/models/repository/subversion.rb
+++ b/app/models/repository/subversion.rb
@@ -20,7 +20,7 @@ require 'redmine/scm/adapters/subversion_adapter'
 class Repository::Subversion < Repository
  attr_protected :root_url
  validates_presence_of :url
-  validates_format_of :url, :with => /^(http|https|svn(\+[^\s:\/\\]+)?|file):\/\/.+/i
+  validates_format_of :url, :with => /^(http|https|svn|svn\+ssh|file):\/\/.+/i

  def scm_adapter
    Redmine::Scm::Adapters::SubversionAdapter
@@ -54,8 +54,8 @@ class Repository::Subversion < Repository
          # loads changesets by batches of 200
          identifier_to = [identifier_from + 199, scm_revision].min
          revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
-          revisions.reverse_each do |revision|
-            transaction do
+          transaction do
+            revisions.reverse_each do |revision|
              changeset = Changeset.create(:repository => self,
                                           :revision => revision.identifier, 
                                           :committer => revision.author, 
@@ -68,7 +68,7 @@ class Repository::Subversion < Repository
                              :path => change[:path],
                              :from_path => change[:from_path],
                              :from_revision => change[:from_revision])
-              end unless changeset.new_record?
+              end
            end
          end unless revisions.nil?
          identifier_from = identifier_to + 1
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -15,11 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-require 'rails_generator/secret_key_generator'
-
 class Token < ActiveRecord::Base
  belongs_to :user
-  validates_uniqueness_of :value
  
  @@validity_time = 1.day
  
@@ -39,7 +36,9 @@ class Token < ActiveRecord::Base
  
 private
  def self.generate_token_value
-    s = Rails::SecretKeyGenerator.new(object_id).generate_secret
-    s[0, 40]
+    chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
+    token_value = ''
+    40.times { |i| token_value << chars[rand(chars.size-1)] }
+    token_value
  end
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -175,14 +175,8 @@ class User < ActiveRecord::Base
  end
  
  def self.find_by_autologin_key(key)
-    tokens = Token.find_all_by_action_and_value('autologin', key)
-    # Make sure there's only 1 token that matches the key
-    if tokens.size == 1
-      token = tokens.first
-      if (token.created_on > Setting.autologin.to_i.day.ago) && token.user && token.user.active?
-        token.user
-      end
-    end
+    token = Token.find_by_action_and_value('autologin', key)
+    token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
  end
  
  # Makes find_by_mail case-insensitive
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -22,7 +22,6 @@ class WikiContent < ActiveRecord::Base
  belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
  validates_presence_of :text
-  validates_length_of :comments, :maximum => 255, :allow_nil => true
  
  acts_as_versioned
  class Version
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -10,7 +10,7 @@
 		<li><%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></li>
 	<% end %>
 	<% for custom_value in @custom_values %>
-	<% if !custom_value.value.blank? %>
+	<% if !custom_value.value.empty? %>
    <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>
 	<% end %>
@@ -29,7 +29,6 @@
 <% end %>
 </ul>
 <% end %>
-<%= call_hook :view_account_left_bottom, :user => @user %>
 </div>

 <div class="splitcontentright">
@@ -65,7 +64,6 @@
 		<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
 <% end %>
 <% end %>
-<%= call_hook :view_account_right_bottom, :user => @user %>
 </div>

 <% html_title @user.name %>
--- a/app/views/common/_calendar.rhtml
+++ b/app/views/common/_calendar.rhtml
@@ -11,7 +11,7 @@ while day <= calendar.enddt %>
 <p class="day-num"><%= day.day %></p>	
 <% calendar.events_on(day).each do |i| %>
  <% if i.is_a? Issue %>
-  <div class="<%= css_issue_classes(i) %> tooltip">
+  <div class="tooltip">
  <%= if day == i.start_date && day == i.due_date
        image_tag('arrow_bw.png')
      elsif day == i.start_date
--- a/app/views/common/_file.rhtml
+++ b/app/views/common/_file.rhtml
@@ -3,7 +3,7 @@
 <tbody>
 <% line_num = 1 %>
 <% syntax_highlight(filename, to_utf8(content)).each_line do |line| %>
-<tr><th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th><td class="line-code"><pre><%= line %></pre></td></tr>
+<tr><th class="line-num" id="L<%= line_num %>"><%= line_num %></th><td class="line-code"><pre><%= line %></pre></td></tr>
 <% line_num += 1 %>
 <% end %>
 </tbody>
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -1,8 +1,8 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
  xml.title   truncate_single_line(@title, 100)
-  xml.link    "rel" => "self", "href" => url_for(params.merge(:only_path => false))
-  xml.link    "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
+  xml.link    "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false}))
+  xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
  xml.id      url_for(:controller => 'welcome', :only_path => false)
  xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
  xml.author  { xml.name "#{Setting.app_title}" }
@@ -21,10 +21,10 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
      author = item.event_author if item.respond_to?(:event_author)
      xml.author do
        xml.name(author)
-        xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
+        xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
      end if author
      xml.content "type" => "html" do
-        xml.text! textilizable(item, :event_description, :only_path => false)
+        xml.text! textilizable(item.event_description)
      end
    end
  end
--- a/app/views/custom_fields/_form.rhtml
+++ b/app/views/custom_fields/_form.rhtml
@@ -82,7 +82,6 @@ function deleteValueField(e) {
 <% end %>
 </p>
 <p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
-<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
 </div>

 <div class="box">
@@ -110,6 +109,5 @@ when "IssueCustomField" %>
    <p><%= f.check_box :is_required %></p>

 <% end %>
-<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
 </div>
 <%= javascript_tag "toggle_custom_field_format();" %>
--- a/app/views/issue_statuses/_form.rhtml
+++ b/app/views/issue_statuses/_form.rhtml
@@ -11,7 +11,5 @@
 <p><label for="issue_status_is_default"><%=l(:field_is_default)%></label>
 <%= check_box 'issue_status', 'is_default' %></p>

-<%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
-
 <!--[eoform:issue_status]-->
-</div>
+</div>
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -7,8 +7,8 @@
 <%= call_hook(:view_issues_sidebar_issues_bottom) %>

 <% planning_links = []
-  planning_links << link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
-  planning_links << link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
+  planning_links << link_to(l(:label_calendar), :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
+  planning_links << link_to(l(:label_gantt), :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
 %>
 <% unless planning_links.empty? %>
 <h3><%= l(:label_planning) %></h3>
--- a/app/views/issues/changes.rxml
+++ b/app/views/issues/changes.rxml
@@ -15,7 +15,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
      xml.updated change.created_on.xmlschema
      xml.author do
        xml.name change.user.name
-        xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
+        xml.email(change.user.mail)
      end
      xml.content "type" => "html" do
        xml.text! '<ul>'
@@ -23,7 +23,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
          xml.text! '<li>' + show_detail(detail, false) + '</li>'
        end
        xml.text! '</ul>'
-        xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
+        xml.text! textilizable(change.notes) unless change.notes.blank?
      end
    end
  end
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -1,6 +1,4 @@
 <ul>
-  <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
-
 <% if !@issue.nil? -%>
 	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
@@ -89,6 +87,4 @@
 	                        :class => 'icon-move', :disabled => !@can[:move]  %></li>
  <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
                            :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %></li>
-
-  <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
 </ul>
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -42,7 +42,6 @@
 <% else %>
 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
 <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
-<% end %>

 <p class="other-formats">
 <%= l(:label_export_to) %>
@@ -51,6 +50,7 @@
 <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
 </p>
 <% end %>
+<% end %>

 <% content_for :sidebar do %>
    <%= render :partial => 'issues/sidebar' %>
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -9,7 +9,7 @@

 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>

-<div class="<%= css_issue_classes(@issue) %> details">
+<div class="<%= css_issue_classes(@issue) %>">
        <%= avatar(@issue.author, :size => "64") %>
        <h3><%=h @issue.subject %></h3>
        <p class="author">
@@ -45,7 +45,7 @@
 </tr>
 <tr>
 <% n = 0 -%>
-<% @issue.custom_field_values.each do |value| -%>
+<% @issue.custom_values.each do |value| -%>
    <td valign="top"><b><%=h value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(value))) %></td>
 <% n = n + 1
   if (n > 1) 
@@ -69,8 +69,6 @@ end %>

 <%= link_to_attachments @issue %>

-<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
-
 <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
 <hr />
 <div id="relations">
--- a/app/views/journals/_notes_form.rhtml
+++ b/app/views/journals/_notes_form.rhtml
@@ -1,6 +1,6 @@
 <% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
-    <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit', 
-                                              :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+    <%= text_area_tag :notes, h(@journal.notes), :class => 'wiki-edit', 
+                                                 :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
    <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
    <p><%= submit_tag l(:button_save) %>
    <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -47,20 +47,18 @@
 <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
    <div id="sidebar">        
        <%= yield :sidebar %>
-        <%= call_hook :view_layouts_base_sidebar %>
    </div>
    
    <div id="content">
 				<%= render_flash_messages %>
        <%= yield %>
-        <%= call_hook :view_layouts_base_content %>
    </div>
 </div>

 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 	
 <div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2009 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2008 Jean-Philippe Lang
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>
--- a/app/views/mailer/account_activated.text.html.rhtml
+++ b/app/views/mailer/account_activated.text.html.rhtml
@@ -1,2 +0,0 @@
-<p><%= l(:notice_account_activated) %></p>
-<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
--- a/app/views/mailer/account_activated.text.plain.rhtml
+++ b/app/views/mailer/account_activated.text.plain.rhtml
@@ -1,2 +0,0 @@
-<%= l(:notice_account_activated) %>
-<%= l(:label_login) %>: <%= @login_url %>
--- a/app/views/mailer/layout.text.plain.rhtml
+++ b/app/views/mailer/layout.text.plain.rhtml
@@ -1,3 +1,3 @@
 <%= yield %>
-- 
+----------------------------------------
 <%= Setting.emails_footer %>
--- a/app/views/mailer/reminder.text.html.rhtml
+++ b/app/views/mailer/reminder.text.html.rhtml
@@ -2,7 +2,7 @@

 <ul>
 <% @issues.each do |issue| -%>
-  <li><%=h issue.project %> - <%=link_to("#{issue.tracker} ##{issue.id}", :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
+    <li><%=h "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %></li>
 <% end -%>
 </ul>

--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -15,7 +15,6 @@
 <p><%= f.text_field :lastname, :required => true %></p>
 <p><%= f.text_field :mail, :required => true %></p>
 <p><%= f.select :language, lang_options_for_select %></p>
-<%= call_hook(:view_my_account, :user => @user, :form => f) %>
 </div>

 <%= submit_tag l(:button_save) %>
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -11,7 +11,7 @@
 <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
 <p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %>
 <% unless @project.identifier_frozen? %>
-<br /><em><%= l(:text_length_between, 1, 20) %> <%= l(:text_project_identifier_info) %></em>
+<br /><em><%= l(:text_length_between, 2, 20) %> <%= l(:text_project_identifier_info) %></em>
 <% end %></p>
 <p><%= f.text_field :homepage, :size => 60 %></p>
 <p><%= f.check_box :is_public %></p>
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -46,9 +46,7 @@
 <% form_tag({}, :method => :get) do %>
 <h3><%= l(:label_activity) %></h3>
 <p><% @activity.event_types.each do |t| %>
-<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
-<%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%>
-<br />
+<label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
 <% end %></p>
 <% if @project && @project.active_children.any? %>
    <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -6,7 +6,7 @@

 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>

-<table class="list files">
+<table class="list">
  <thead><tr>
    <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
    <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
@@ -19,19 +19,15 @@
 <% @containers.each do |container| %>	
  <% next if container.attachments.empty? -%>
 	<% if container.is_a?(Version) -%>
-  <tr>
-  	<th colspan="6" align="left">
-  		<%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
-		</th>
-	</tr>
+  <tr><th colspan="6" align="left"><span class="icon icon-package"><b><%=h container %></b></span></th></tr>
 	<% end -%>
  <% container.attachments.each do |file| %>		
-  <tr class="file <%= cycle("odd", "even") %>">
-    <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
-    <td class="created_on"><%= format_time(file.created_on) %></td>
-    <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-    <td class="downloads"><%= file.downloads %></td>
-    <td class="digest"><%= file.digest %></td>
+  <tr class="<%= cycle("odd", "even") %>">
+    <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
+    <td align="center"><%= format_time(file.created_on) %></td>
+    <td align="center"><%= number_to_human_size(file.filesize) %></td>
+    <td align="center"><%= file.downloads %></td>
+    <td align="center"><small><%= file.digest %></small></td>
    <td align="center">
    <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
 																				 :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>
--- a/app/views/projects/settings.rhtml
+++ b/app/views/projects/settings.rhtml
@@ -1,8 +1,6 @@
 <h2><%=l(:label_settings)%></h2>

 <% tabs = project_settings_tabs %>
-
-<% if tabs.any? %>
 <% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>

 <div class="tabs">
@@ -22,8 +20,5 @@
                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
                       :class => 'tab-content') %>
 <% end -%>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>

 <% html_title(l(:label_settings)) -%>
--- a/app/views/projects/settings/_versions.rhtml
+++ b/app/views/projects/settings/_versions.rhtml
@@ -14,7 +14,7 @@
    <td><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></td>
    <td align="center"><%= format_date(version.effective_date) %></td>
    <td><%=h version.description %></td>
-    <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
+    <td><%= link_to(version.wiki_page_title, :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
    <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
    <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
    </tr>
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -11,7 +11,7 @@
 	<li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
 	<% end %>
 	<% @project.custom_values.each do |custom_value| %>
-	<% if !custom_value.value.blank? %>
+	<% if !custom_value.value.empty? %>
 	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>
 	<% end %>
@@ -32,7 +32,6 @@
    <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
  </div>
  <% end %>
-  <%= call_hook(:view_projects_show_left, :project => @project) %>
 </div>

 <div class="splitcontentright">
@@ -54,7 +53,6 @@
    <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
  </div>  
  <% end %>
-  <%= call_hook(:view_projects_show_right, :project => @project) %>
 </div>

 <% content_for :sidebar do %>
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -11,7 +11,7 @@
    <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
    <% revision = @annotate.revisions[line_num-1] %>
    <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
-      <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
+      <th class="line-num"><%= line_num %></th>
      <td class="revision">
      <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
      <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
--- a/app/views/roles/edit.rhtml
+++ b/app/views/roles/edit.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_role)%>: <%=h @role.name %></h2> 
+<h2><%=l(:label_role)%>: <%= @role.name %></h2> 

 <% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
--- a/app/views/settings/_issues.rhtml
+++ b/app/views/settings/_issues.rhtml
@@ -11,12 +11,12 @@
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 </div>

-<fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
+<fieldset class="box"><legend><%= l(:setting_issue_list_default_columns) %></legend>
 <%= hidden_field_tag 'settings[issue_list_default_columns][]', '' %>
-<% Query.new.available_columns.each do |column| %>
+<p><% Query.new.available_columns.each do |column| %>
  <label><%= check_box_tag 'settings[issue_list_default_columns][]', column.name, Setting.issue_list_default_columns.include?(column.name.to_s) %>
-	<%= column.caption %></label><br />
-<% end %>
+  <%= column.caption %></label>
+<% end %></p>
 </fieldset>

 <%= submit_tag l(:button_save) %>
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -7,7 +7,7 @@
 <h2><%= l(:label_spent_time) %></h2>

 <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
-<%= hidden_field_tag('project_id', params[:project_id]) if @project %>
+<%= hidden_field_tag 'project_id', params[:project_id] %>
 <%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
 <%= render :partial => 'date_range' %>
 <% end %>
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -10,7 +10,7 @@
  <% @criterias.each do |criteria| %>
    <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
  <% end %>
-  <%= hidden_field_tag('project_id', params[:project_id]) if @project %>
+  <%= hidden_field_tag 'project_id', params[:project_id] %>
  <%= render :partial => 'date_range' %>

  <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -13,7 +13,6 @@
 <% end %>

 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
-<%= call_hook(:view_users_form, :user => @user, :form => f) %>
 </div>

 <div class="box">
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -4,7 +4,6 @@
 	  <th><%= l(:label_project) %></th>
 	  <th><%= l(:label_role) %></th>
 	  <th style="width:15%"></th>
-      <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
 	</thead>
 	<tbody>
 	<% @memberships.each do |membership| %>
@@ -20,7 +19,6 @@
    <td align="center">
      <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :method => :post, :class => 'icon icon-del' %>
    </td>
-      <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => @roles, :projects => @projects )%>
 	</tr>
 	</tbody>
 <% end; reset_cycle %>
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -1,6 +1,5 @@
 <div class="contextual">
 <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
-<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 </div>

 <h2><%= h(@version.name) %></h2>
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -9,7 +9,6 @@
 		<%= link_to l(:label_news_view_all), :controller => 'news' %>
  </div>
  <% end %>
-  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
 </div>

 <div class="splitcontentright">
@@ -26,7 +25,6 @@
 		</ul>
 	</div>
 	<% end %>
-    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
 </div>	

 <% content_for :header_tags do %>
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -31,7 +31,6 @@
 <%= link_to_attachments @page %>

 <% if @editable && authorize_for('wiki', 'add_attachment') %>
-<div id="wiki_add_attachment">
 <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                             :id => 'attach_files_link' %></p>
 <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
@@ -41,7 +40,6 @@
 <%= submit_tag l(:button_add) %>
 <%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
 <% end %>
-</div>
 <% end %>

 <p class="other-formats">
--- a/app/views/wiki/special_date_index.rhtml
+++ b/app/views/wiki/special_date_index.rhtml
@@ -20,11 +20,11 @@
 <% unless @pages.empty? %>
 <p class="other-formats">
 <%= l(:label_export_to) %>
-<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'html' %></span>
 </p>
 <% end %>

 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>
--- a/app/views/wiki/special_page_index.rhtml
+++ b/app/views/wiki/special_page_index.rhtml
@@ -13,11 +13,11 @@
 <% unless @pages.empty? %>
 <p class="other-formats">
 <%= l(:label_export_to) %>
-<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'HTML', {:action => 'special', :page => 'export'} %></span>
 </p>
 <% end %>

 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>
--- a/config/initializers/bigdecimal-segfault-fix.rb
+++ b/config/initializers/bigdecimal-segfault-fix.rb
@@ -1,30 +0,0 @@
-# Copyright (c) 2009 Michael Koziarski <michael@koziarski.com>
-# 
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-require 'bigdecimal'
-
-alias BigDecimalUnsafe BigDecimal
-
-
-# This fixes CVE-2009-1904 however it removes legitimate functionality that your
-# application may depend on.  You are *strongly* advised to upgrade your ruby
-# rather than relying on this fix for an extended period of time.
-
-def BigDecimal(initial, digits=0)
-  if initial.size > 255 || initial =~ /e/i
-    raise "Invalid big Decimal Value"
-  end
-  BigDecimalUnsafe(initial, digits)
-end
-
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,86 +4,6 @@ Redmine - project management software
 Copyright (C) 2006-2009  Jean-Philippe Lang
 http://www.redmine.org/

-== 2009-11-04 v0.8.6
-
-* Change links to closed issues to be a grey color
-* Change subversion adapter to not cache authentication and run non interactively
-* Fixed: Custom Values with a nil value cause HTTP error 500
-* Fixed: Failure to convert HTML entities when editing an Issue reply
-* Fixed: Error trying to show repository when there are no comments in a changeset
-* Fixed: account/show/:user_id should not be accessible for other users not in your projects
-* Fixed: XSS vulnerabilities
-* Fixed: IssuesController#destroy should accept POST only
-* Fixed: Inline images in wiki headings
-
-
-== 2009-09-13 v0.8.5
-
-* Incoming mail handler : Allow spaces between keywords and colon
-* Do not require a non-word character after a comma in Redmine links
-* Include issue hyperlinks in reminder emails
-* Prevent nil error when retrieving svn version
-* Various plugin hooks added
-* Add plugins information to script/about
-* Fixed: 500 Internal Server Error is raised if add an empty comment to the news
-* Fixed: Atom links for wiki pages are not correct
-* Fixed: Atom feeds leak email address
-* Fixed: Case sensitivity in Issue filtering
-* Fixed: When reading RSS feed, the inline-embedded images are not properly shown
-
-
-== 2009-05-17 v0.8.4
-
-* Allow textile mailto links
-* Fixed: memory consumption when uploading file
-* Fixed: Mercurial integration doesn't work if Redmine is installed in folder path containing space
-* Fixed: an error is raised when no tab is available on project settings
-* Fixed: insert image macro corrupts urls with excalamation marks
-* Fixed: error on cross-project gantt PNG export
-* Fixed: self and alternate links in atom feeds do not respect Atom specs
-* Fixed: accept any svn tunnel scheme in repository URL
-* Fixed: issues/show should accept user's rss key
-* Fixed: consistency of custom fields display on the issue detail view
-* Fixed: wiki comments length validation is missing
-* Fixed: weak autologin token generation algorithm causes duplicate tokens
-
-
-== 2009-04-05 v0.8.3
-
-* Separate project field and subject in cross-project issue view
-* Ability to set language for redmine:load_default_data task using REDMINE_LANG environment variable
-* Rescue Redmine::DefaultData::DataAlreadyLoaded in redmine:load_default_data task
-* CSS classes to highlight own and assigned issues
-* Hide "New file" link on wiki pages from printing
-* Flush buffer when asking for language in redmine:load_default_data task
-* Minimum project identifier length set to 1
-* Include headers so that emails don't trigger vacation auto-responders
-* Fixed: Time entries csv export links for all projects are malformed
-* Fixed: Files without Version aren't visible in the Activity page
-* Fixed: Commit logs are centered in the repo browser
-* Fixed: News summary field content is not searchable
-* Fixed: Journal#save has a wrong signature
-* Fixed: Email footer signature convention
-* Fixed: Timelog report do not show time for non-versioned issues
-
-
-== 2009-03-07 v0.8.2
-
-* Send an email to the user when an administrator activates a registered user
-* Strip keywords from received email body
-* Footer updated to 2009
-* Show RSS-link even when no issues is found
-* One click filter action in activity view
-* Clickable/linkable line #'s while browsing the repo or viewing a file
-* Links to versions on files list
-* Added request and controller objects to the hooks by default
-* Fixed: exporting an issue with attachments to PDF raises an error
-* Fixed: "too few arguments" error may occur on activerecord error translation
-* Fixed: "Default columns Displayed on the Issues list" setting is not easy to read
-* Fixed: visited links to closed tickets are not striked through with IE6
-* Fixed: MailHandler#plain_text_body returns nil if there was nothing to strip
-* Fixed: MailHandler raises an error when processing an email without From header
-

 == 2009-02-15 v0.8.1

--- a/lang/es.yml
+++ b/lang/es.yml
@@ -681,6 +681,6 @@ text_user_mail_option: "De los proyectos no seleccionados, sólo recibirá notif
 text_user_wrote: '%s escribió:'
 text_wiki_destroy_confirmation: ¿Seguro que quiere borrar el wiki y todo su contenido?
 text_workflow_edit: Seleccionar un flujo de trabajo para actualizar
-text_plugin_assets_writable: Se puede escribir en el directorio de extensiones activas
-warning_attachments_not_saved: "No pudieron guardarse %d fichero(s)."
-button_create_and_continue: Crear y continuar
+text_plugin_assets_writable: Plugin assets directory writable
+warning_attachments_not_saved: "%d file(s) could not be saved."
+button_create_and_continue: Create and continue
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -792,7 +792,7 @@ class RedCloth3 < String
            (?:\(([^)]+?)\)(?="))?     # $title
            ":
            (                          # $url
-            (\/|[a-zA-Z]+:\/\/|www\.|mailto:)  # $proto
+            (\/|[a-zA-Z]+:\/\/|www\.)  # $proto
            [\w\/]\S+?
            )               
            (\/)?                      # $slash
@@ -907,7 +907,7 @@ class RedCloth3 < String
    end

    IMAGE_RE = /
-            (>|\s|^)           # start of line?
+            (<p>|.|^)            # start of line?
            \!                   # opening
            (\<|\=|\>)?          # optional alignment atts
            (#{C})               # optional style,class atts
--- a/lib/redmine/about.rb
+++ b/lib/redmine/about.rb
@@ -1,16 +0,0 @@
-module Redmine
-  class About
-    def self.print_plugin_info
-      plugins = Redmine::Plugin.registered_plugins
-
-      if !plugins.empty?
-        column_with = plugins.map {|internal_name, plugin| plugin.name.length}.max
-        puts "\nAbout your Redmine plugins"
-
-        plugins.each do |internal_name, plugin|
-          puts sprintf("%-#{column_with}s   %s", plugin.name, plugin.version)
-        end
-      end
-    end
-  end
-end
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -21,8 +21,6 @@ require 'rfpdf/chinese'
 module Redmine
  module Export
    module PDF
-      include ActionView::Helpers::NumberHelper
-      
      class IFPDF < FPDF
        include GLoc
        attr_accessor :footer_date
--- a/lib/redmine/hook.rb
+++ b/lib/redmine/hook.rb
@@ -17,8 +17,6 @@

 module Redmine
  module Hook
-    include ActionController::UrlWriter
-
    @@listener_classes = []
    @@listeners = nil
    @@hook_listeners = {}
@@ -57,12 +55,11 @@ module Redmine
      # Calls a hook.
      # Returns the listeners response.
      def call_hook(hook, context={})
-        returning [] do |response|
-          hls = hook_listeners(hook)
-          if hls.any?
-            hls.each {|listener| response << listener.send(hook, context)}
-          end
+        response = ''
+        hook_listeners(hook).each do |listener|
+          response << listener.send(hook, context).to_s
        end
+        response
      end
    end

@@ -76,9 +73,8 @@ module Redmine
        Redmine::Hook.add_listener(child)
        super
      end
-
    end
-
+    
    # Listener class used for views hooks.
    # Listeners that inherit this class will include various helpers by default.
    class ViewListener < Listener
@@ -95,54 +91,17 @@ module Redmine
      include ActionView::Helpers::TextHelper
      include ActionController::UrlWriter
      include ApplicationHelper
-
-      # Default to creating links using only the path.  Subclasses can
-      # change this default as needed
-      def self.default_url_options
-        {:only_path => true }
-      end
-      
-      # Helper method to directly render a partial using the context:
-      # 
-      #   class MyHook < Redmine::Hook::ViewListener
-      #     render_on :view_issues_show_details_bottom, :partial => "show_more_data" 
-      #   end
-      #
-      def self.render_on(hook, options={})
-        define_method hook do |context|
-          context[:controller].send(:render_to_string, {:locals => context}.merge(options))
-        end
-      end
    end

-    # Helper module included in ApplicationHelper and ActionControllerso that
-    # hooks can be called in views like this:
-    # 
+    # Helper module included in ApplicationHelper so that hooks can be called
+    # in views like this:
    #   <%= call_hook(:some_hook) %>
    #   <%= call_hook(:another_hook, :foo => 'bar' %>
    # 
-    # Or in controllers like:
-    #   call_hook(:some_hook)
-    #   call_hook(:another_hook, :foo => 'bar'
-    # 
-    # Hooks added to views will be concatenated into a string.  Hooks added to
-    # controllers will return an array of results.
-    #
-    # Several objects are automatically added to the call context:
-    # 
-    # * project => current project
-    # * request => Request instance
-    # * controller => current Controller instance
-    # 
+    # Current project is automatically added to the call context.
    module Helper
      def call_hook(hook, context={})
-        if is_a?(ActionController::Base)
-          default_context = {:controller => self, :project => @project, :request => request}
-          Redmine::Hook.call_hook(hook, default_context.merge(context))
-        else
-          default_context = {:controller => controller, :project => @project, :request => request}
-          Redmine::Hook.call_hook(hook, default_context.merge(context)).join(' ')
-        end        
+        Redmine::Hook.call_hook(hook, {:project => @project}.merge(context))
      end
    end
  end
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -105,7 +105,7 @@ module Redmine
        # makes Mercurial produce a xml output.
        def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})  
          revisions = Revisions.new
-          cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{shell_quote self.class.template_path}"
+          cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{self.class.template_path}"
          if identifier_from && identifier_to
            cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
          elsif identifier_from
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -37,7 +37,7 @@ module Redmine
            version = nil
            shellout(cmd) do |io|
              # Read svn version in first returned line
-              if m = io.gets.to_s.match(%r{((\d+\.)+\d+)})
+              if m = io.gets.match(%r{((\d+\.)+\d+)})
                version = m[0].scan(%r{\d+}).collect(&:to_i)
              end
            end
@@ -224,7 +224,6 @@ module Redmine
          str = ''
          str << " --username #{shell_quote(@login)}" unless @login.blank?
          str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
-          str << " --no-auth-cache --non-interactive"
          str
        end
      end
--- a/lib/redmine/utils.rb
+++ b/lib/redmine/utils.rb
@@ -1,38 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2009  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-module Redmine
-  module Utils
-    class << self
-      # Returns the relative root url of the application
-      def relative_url_root
-        ActionController::Base.respond_to?('relative_url_root') ?
-          ActionController::Base.relative_url_root.to_s :
-          ActionController::AbstractRequest.relative_url_root.to_s
-      end
-      
-      # Sets the relative root url of the application
-      def relative_url_root=(arg)
-        if ActionController::Base.respond_to?('relative_url_root=')
-          ActionController::Base.relative_url_root=arg
-        else
-          ActionController::AbstractRequest.relative_url_root=arg
-        end
-      end
-    end
-  end
-end
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
  module VERSION #:nodoc:
    MAJOR = 0
    MINOR = 8
-    TINY  = 6
+    TINY  = 1
    
    # Branch values:
    # * official release: nil
--- a/lib/tasks/load_default_data.rake
+++ b/lib/tasks/load_default_data.rake
@@ -1,32 +1,26 @@
-desc 'Load Redmine default configuration data. Language is chosen interactively or by setting REDMINE_LANG environment variable.'
+desc 'Load Redmine default configuration data'

 namespace :redmine do
  task :load_default_data => :environment do
    include GLoc
    set_language_if_valid('en')
+    puts
    
-    envlang = ENV['REDMINE_LANG']
-    if !envlang || !set_language_if_valid(envlang)
-      puts
-      while true
-        print "Select language: "
-        print GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }.join(", ")
-        print " [#{GLoc.current_language}] "
-        STDOUT.flush
-        lang = STDIN.gets.chomp!
-        break if lang.empty?
-        break if set_language_if_valid(lang)
-        puts "Unknown language!"
-      end
-      STDOUT.flush
-      puts "===================================="
+    while true
+      print "Select language: "
+      print GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }.join(", ")
+      print " [#{GLoc.current_language}] "
+      lang = STDIN.gets.chomp!
+      break if lang.empty?
+      break if set_language_if_valid(lang)
+      puts "Unknown language!"
    end
    
+    puts "===================================="
+    
    begin
      Redmine::DefaultData::Loader.load(current_language)
      puts "Default configuration data loaded."
-    rescue Redmine::DefaultData::DataAlreadyLoaded => error
-      puts error
    rescue => error
      puts "Error: " + error
      puts "Default configuration data was not loaded."
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -195,13 +195,8 @@ task :migrate_from_mantis => :environment do
        file_type
      end
      
-      def read(*args)
-      	if @read_finished
-      		nil
-      	else
-      		@read_finished = true
-      		content
-      	end
+      def read
+        content
      end
    end
    
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -135,15 +135,8 @@ namespace :redmine do
          File.file? trac_fullpath
        end

-        def open
-          File.open("#{trac_fullpath}", 'rb') {|f|
-            @file = f
-            yield self
-          }
-        end
-
-        def read(*args)
-          @file.read(*args)
+        def read
+          File.open("#{trac_fullpath}", 'rb').read
        end

        def description
@@ -513,14 +506,12 @@ namespace :redmine do
          # Attachments
          ticket.attachments.each do |attachment|
            next unless attachment.exist?
-              attachment.open {
-                a = Attachment.new :created_on => attachment.time
-                a.file = attachment
-                a.author = find_or_create_user(attachment.author)
-                a.container = i
-                a.description = attachment.description
-                migrated_ticket_attachments += 1 if a.save
-              }
+              a = Attachment.new :created_on => attachment.time
+              a.file = attachment
+              a.author = find_or_create_user(attachment.author)
+              a.container = i
+              a.description = attachment.description
+              migrated_ticket_attachments += 1 if a.save
          end

          # Custom fields
@@ -565,14 +556,12 @@ namespace :redmine do
            page.attachments.each do |attachment|
              next unless attachment.exist?
              next if p.attachments.find_by_filename(attachment.filename.gsub(/^.*(\\|\/)/, '').gsub(/[^\w\.\-]/,'_')) #add only once per page
-              attachment.open {
-                a = Attachment.new :created_on => attachment.time
-                a.file = attachment
-                a.author = find_or_create_user(attachment.author)
-                a.description = attachment.description
-                a.container = p
-                migrated_wiki_attachments += 1 if a.save
-              }
+              a = Attachment.new :created_on => attachment.time
+              a.file = attachment
+              a.author = find_or_create_user(attachment.author)
+              a.description = attachment.description
+              a.container = p
+              migrated_wiki_attachments += 1 if a.save
            end
          end

--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -18,7 +18,7 @@ h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
  padding: 0px 0px 0px 0px;
  white-space:nowrap;
 }
-#top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
+#top-menu a {color: #fff; padding-right: 8px; font-weight: bold;}
 #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }

 #account {float:right;}
@@ -76,7 +76,7 @@ a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
 a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
 a img{ border: 0; }

-a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
+a.issue.closed { text-decoration: line-through; }

 /***** Tables *****/
 table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
@@ -104,10 +104,6 @@ tr.entry.file td.filename a { margin-left: 16px; }
 tr.changeset td.author { text-align: center; width: 15%; }
 tr.changeset td.committed_on { text-align: center; width: 15%; }

-table.files tr.file td { text-align: center; }
-table.files tr.file td.filename { text-align: left; padding-left: 24px; }
-table.files tr.file td.digest { font-size: 80%; }
-
 tr.message { height: 2.6em; }
 tr.message td.last_message { font-size: 80%; }
 tr.message.locked td.subject a { background-image: url(../images/locked.png); }
@@ -683,5 +679,4 @@ h2 img { vertical-align:middle; }
  #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
  #main { background: #fff; }
  #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
-	#wiki_add_attachment { display:none; }
 }
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -40,10 +40,6 @@ table.filecontent th.line-num {
 	padding-right: 3px;
 	color: #999;
 }
-table.filecontent th.line-num a {
-	text-decoration: none;
-	color: inherit;
-}
 table.filecontent td.line-code pre {
    white-space: pre-wrap; /* CSS2.1 compliant */
    white-space: -moz-pre-wrap; /* Mozilla-based browsers */
--- a/script/about
+++ b/script/about
@@ -1,6 +1,3 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
-
-Redmine::About.print_plugin_info
+require 'commands/about'
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -109,16 +109,4 @@ attachments_009:
  filename: version_file.zip
  author_id: 2
  content_type: application/octet-stream
-attachments_010: 
-  created_on: 2006-07-19 21:07:27 +02:00
-  container_type: Issue
-  container_id: 2
-  downloads: 0
-  disk_filename: 060719210727_picture.jpg
-  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
-  id: 10
-  filesize: 452
-  filename: picture.jpg
-  author_id: 2
-  content_type: image/jpeg
  
--- a/test/fixtures/journals.yml
+++ b/test/fixtures/journals.yml
@@ -13,11 +13,4 @@ journals_002:
  journalized_type: Issue
  user_id: 2
  journalized_id: 1
-journals_003: 
-  created_on: <%= 1.days.ago.to_date.to_s(:db) %>
-  notes: "A comment with inline image: !picture.jpg!"
-  id: 3
-  journalized_type: Issue
-  user_id: 2
-  journalized_id: 2
  
--- a/test/fixtures/mail_handler/ticket_with_spaces_between_attribute_and_separator.eml
+++ b/test/fixtures/mail_handler/ticket_with_spaces_between_attribute_and_separator.eml
@@ -1,43 +0,0 @@
-Return-Path: <jsmith@somenet.foo>
-Received: from osiris ([127.0.0.1])
-	by OSIRIS
-	with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
-Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
-From: "John Smith" <jsmith@somenet.foo>
-To: <redmine@somenet.foo>
-Subject: New ticket on a given project
-Date: Sun, 22 Jun 2008 12:28:07 +0200
-MIME-Version: 1.0
-Content-Type: text/plain;
-	format=flowed;
-	charset="iso-8859-1";
-	reply-type=original
-Content-Transfer-Encoding: 7bit
-X-Priority: 3
-X-MSMail-Priority: Normal
-X-Mailer: Microsoft Outlook Express 6.00.2900.2869
-X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas imperdiet 
-turpis et odio. Integer eget pede vel dolor euismod varius. Phasellus 
-blandit eleifend augue. Nulla facilisi. Duis id diam. Class aptent taciti 
-sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In 
-in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras 
-sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum 
-id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus 
-eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique 
-sed, mauris. Pellentesque habitant morbi tristique senectus et netus et 
-malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse 
-platea dictumst.
-
-Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque 
-sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem. 
-Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et, 
-dictum et, ligula. Sed erat nibh, gravida in, accumsan non, placerat sed, 
-massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo 
-pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
-
-Project : onlinestore
-Tracker: Feature request
-category : Stock management
-priority: Urgent
--- a/test/fixtures/mail_handler/ticket_without_from_header.eml
+++ b/test/fixtures/mail_handler/ticket_without_from_header.eml
@@ -1,40 +0,0 @@
-Received: from osiris ([127.0.0.1])
-	by OSIRIS
-	with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
-Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
-To: <redmine@somenet.foo>
-Subject: New ticket on a given project
-Date: Sun, 22 Jun 2008 12:28:07 +0200
-MIME-Version: 1.0
-Content-Type: text/plain;
-	format=flowed;
-	charset="iso-8859-1";
-	reply-type=original
-Content-Transfer-Encoding: 7bit
-X-Priority: 3
-X-MSMail-Priority: Normal
-X-Mailer: Microsoft Outlook Express 6.00.2900.2869
-X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas imperdiet 
-turpis et odio. Integer eget pede vel dolor euismod varius. Phasellus 
-blandit eleifend augue. Nulla facilisi. Duis id diam. Class aptent taciti 
-sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In 
-in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras 
-sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum 
-id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus 
-eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique 
-sed, mauris. Pellentesque habitant morbi tristique senectus et netus et 
-malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse 
-platea dictumst.
-
-Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque 
-sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem. 
-Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et, 
-dictum et, ligula. Sed erat nibh, gravida in, accumsan non, placerat sed, 
-massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo 
-pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
-
-Project: onlinestore
-Status: Resolved
-
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -96,53 +96,5 @@ users_006:
  mail_notification: false
  login: ''
  type: AnonymousUser
-users_007: 
-  id: 7
-  created_on: 2006-07-19 19:33:19 +02:00
-  status: 1
-  last_login_on: 
-  language: ''
-  hashed_password: 1
-  updated_on: 2006-07-19 19:33:19 +02:00
-  admin: false
-  mail: someone@foo.bar
-  lastname: One
-  firstname: Some
-  auth_source_id: 
-  mail_notification: false
-  login: someone
-  type: User
-users_008: 
-  id: 8
-  created_on: 2006-07-19 19:33:19 +02:00
-  status: 1
-  last_login_on: 
-  language: 'it'
-  hashed_password: 1
-  updated_on: 2006-07-19 19:33:19 +02:00
-  admin: false
-  mail: miscuser8@foo.bar
-  lastname: Misc
-  firstname: User
-  auth_source_id: 
-  mail_notification: false
-  login: miscuser8
-  type: User
-users_009: 
-  id: 9
-  created_on: 2006-07-19 19:33:19 +02:00
-  status: 1
-  last_login_on: 
-  language: 'it'
-  hashed_password: 1
-  updated_on: 2006-07-19 19:33:19 +02:00
-  admin: false
-  mail: miscuser9@foo.bar
-  lastname: Misc
-  firstname: User
-  auth_source_id: 
-  mail_notification: false
-  login: miscuser9
-  type: User

  
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -37,30 +37,13 @@ class AccountControllerTest < Test::Unit::TestCase
    assert_template 'show'
    assert_not_nil assigns(:user)
  end
-
-  def test_show_should_not_fail_when_custom_values_are_nil
-    user = User.find(2)
-
-    # Create a custom field to illustrate the issue
-    custom_field = CustomField.create!(:name => 'Testing', :field_format => 'text')
-    custom_value = user.custom_values.build(:custom_field => custom_field).save!
-
-    get :show, :id => 2
-    assert_response :success
-  end
  
-
  def test_show_inactive
    get :show, :id => 5
    assert_response 404
    assert_nil assigns(:user)
  end
  
-  def test_show_should_not_reveal_users_with_no_visible_activity_or_project
-    get :show, :id => 9
-    assert_response 404
-  end
-  
  def test_login_should_redirect_to_back_url_param
    # request.uri is "test.host" in test environment
    post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http%3A%2F%2Ftest.host%2Fissues%2Fshow%2F1'
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -51,8 +51,6 @@ class IssuesControllerTest < Test::Unit::TestCase
  end

  def test_index
-    Setting.default_language = 'en'
-    
    get :index
    assert_response :success
    assert_template 'index.rhtml'
@@ -63,8 +61,6 @@ class IssuesControllerTest < Test::Unit::TestCase
    # private projects hidden
    assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
    assert_no_tag :tag => 'a', :content => /Issue on project 2/
-    # project column
-    assert_tag :tag => 'th', :content => /Project/
  end
  
  def test_index_should_not_list_issues_when_module_disabled
@@ -255,17 +251,9 @@ class IssuesControllerTest < Test::Unit::TestCase
                                :child => { :tag => 'legend', 
                                            :content => /Notes/ } }
  end
-  
-  def test_show_atom
-    get :show, :id => 2, :format => 'atom'
-    assert_response :success
-    assert_template 'changes'
-    # Inline image
-    assert @response.body.include?("&lt;img src=\"http://test.host/attachments/download/10\" alt=\"\" /&gt;")
-  end

  def test_show_export_to_pdf
-    get :show, :id => 3, :format => 'pdf'
+    get :show, :id => 1, :format => 'pdf'
    assert_response :success
    assert_equal 'application/pdf', @response.content_type
    assert @response.body.starts_with?('%PDF')
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -118,15 +118,6 @@ class NewsControllerTest < Test::Unit::TestCase
    assert_equal User.find(2), comment.author
  end
  
-  def test_empty_comment_should_not_be_added
-    @request.session[:user_id] = 2
-    assert_no_difference 'Comment.count' do
-      post :add_comment, :id => 1, :comment => { :comments => '' }
-      assert_response :success
-      assert_template 'show'
-    end
-  end
-  
  def test_destroy_comment
    comments_count = News.find(1).comments.size
    @request.session[:user_id] = 2
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -68,16 +68,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
    assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
  end
  
-  def test_show_should_not_fail_when_custom_values_are_nil
-    project = Project.find_by_identifier('ecookbook')
-    project.custom_values.first.update_attribute(:value, nil)
-    get :show, :id => 'ecookbook'
-    assert_response :success
-    assert_template 'show'
-    assert_not_nil assigns(:project)
-    assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
-  end
-  
  def test_private_subprojects_hidden
    get :show, :id => 'ecookbook'
    assert_response :success
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -64,22 +64,6 @@ class UsersControllerTest < Test::Unit::TestCase
    assert_equal 2, Member.find(1).role_id
  end
  
-  def test_edit_with_activation_should_send_a_notification
-    u = User.new(:firstname => 'Foo', :lastname => 'Bar', :mail => 'foo.bar@somenet.foo', :language => 'fr')
-    u.login = 'foo'
-    u.status = User::STATUS_REGISTERED
-    u.save!
-    ActionMailer::Base.deliveries.clear
-    Setting.bcc_recipients = '1'
-    
-    post :edit, :id => u.id, :user => {:status => User::STATUS_ACTIVE}
-    assert u.reload.active?
-    mail = ActionMailer::Base.deliveries.last
-    assert_not_nil mail
-    assert_equal ['foo.bar@somenet.foo'], mail.bcc
-    assert mail.body.include?(ll('fr', :notice_account_activated))
-  end
-  
  def test_destroy_membership
    post :destroy_membership, :id => 2, :membership_id => 1
    assert_redirected_to 'users/edit/2'
--- a/test/unit/activity_test.rb
+++ b/test/unit/activity_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'

 class ActivityTest < Test::Unit::TestCase
-  fixtures :projects, :versions, :attachments, :users, :roles, :members, :issues, :journals, :journal_details,
+  fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
           :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages

  def setup
@@ -72,18 +72,6 @@ class ActivityTest < Test::Unit::TestCase
    assert_nil(events.detect {|e| e.event_author != user})
  end
  
-  def test_files_activity
-    f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
-    f.scope = ['files']
-    events = f.events
-    
-    assert_kind_of Array, events
-    assert events.include?(Attachment.find_by_container_type_and_container_id('Project', 1))
-    assert events.include?(Attachment.find_by_container_type_and_container_id('Version', 1))
-    assert_equal [Attachment], events.collect(&:class).uniq
-    assert_equal %w(Project Version), events.collect(&:container_type).uniq.sort
-  end
-  
  private
  
  def find_events(user, options={})
--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -22,19 +22,6 @@ class AttachmentTest < Test::Unit::TestCase
  
  def setup
  end
-
-  def test_create
-    a = Attachment.new(:container => Issue.find(1),
-                       :file => test_uploaded_file("testfile.txt", "text/plain"),
-                       :author => User.find(1))
-    assert a.save
-    assert_equal 'testfile.txt', a.filename
-    assert_equal 59, a.filesize
-    assert_equal 'text/plain', a.content_type
-    assert_equal 0, a.downloads
-    assert_equal Digest::MD5.hexdigest(test_uploaded_file("testfile.txt", "text/plain").read), a.digest
-    assert File.exist?(a.diskfile)
-  end
  
  def test_diskfilename
    assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
@@ -43,4 +30,8 @@ class AttachmentTest < Test::Unit::TestCase
    assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]
    assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
  end
+  
+  def test_digest
+    assert_equal '1478adae0d4eb06d35897518540e25d6', Attachment.digest(Test::Unit::TestCase.fixture_path + "/files/testfile.txt")
+  end
 end
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -55,8 +55,6 @@ class ApplicationHelperTest < HelperTestCase
      'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>',
      'ftps://foo.bar' => '<a class="external" href="ftps://foo.bar">ftps://foo.bar</a>',
      'sftp://foo.bar' => '<a class="external" href="sftp://foo.bar">sftp://foo.bar</a>',
-      # two exclamation marks
-      'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>',
    }
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
  end
@@ -79,19 +77,6 @@ class ApplicationHelperTest < HelperTestCase
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
  end
  
-  def test_inline_images_inside_tags
-    raw = <<-RAW
-h1. !foo.png! Heading
-
-Centered image:
-
-p=. !bar.gif!
-RAW
-
-    assert textilizable(raw).include?('<img src="foo.png" alt="" />')
-    assert textilizable(raw).include?('<img src="bar.gif" alt="" />')
-  end
-  
  def test_acronyms
    to_test = {
      'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>',
@@ -120,11 +105,7 @@ RAW
      '"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with &quot;double-quotes&quot;" class="external">link</a>',
      "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
      # no multiline link text
-      "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test",
-      # mailto link
-      "\"system administrator\":mailto:sysadmin@example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin@example.com?subject=redmine%20permissions\">system administrator</a>",
-      # two exclamation marks
-      '"a link":http://example.net/path!602815048C7B5C20!302.html' => '<a href="http://example.net/path!602815048C7B5C20!302.html" class="external">a link</a>',
+      "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
    }
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
  end
@@ -135,8 +116,6 @@ RAW
    
    changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                   :class => 'changeset', :title => 'My very first commit')
-    changeset_link2 = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
-                                    :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
    
    document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
                                             :class => 'document')
@@ -154,9 +133,6 @@ RAW
      '#3, #3 and #3.'              => "#{issue_link}, #{issue_link} and #{issue_link}.",
      # changesets
      'r1'                          => changeset_link,
-      'r1.'                         => "#{changeset_link}.",
-      'r1, r2'                      => "#{changeset_link}, #{changeset_link2}",
-      'r1,r2'                       => "#{changeset_link},#{changeset_link2}",
      # documents
      'document#1'                  => document_link,
      'document:"Test document"'    => document_link,
--- a/test/unit/lib/redmine/hook_test.rb
+++ b/test/unit/lib/redmine/hook_test.rb
@@ -19,10 +19,8 @@ require File.dirname(__FILE__) + '/../../../test_helper'

 class Redmine::Hook::ManagerTest < Test::Unit::TestCase

-  fixtures :issues
-  
  # Some hooks that are manually registered in these tests
-  class TestHook < Redmine::Hook::ViewListener; end
+  class TestHook < Redmine::Hook::Listener; end
  
  class TestHook1 < TestHook
    def view_layouts_base_html_head(context)
@@ -41,27 +39,10 @@ class Redmine::Hook::ManagerTest < Test::Unit::TestCase
      "Context keys: #{context.keys.collect(&:to_s).sort.join(', ')}."
    end
  end
-  
-  class TestLinkToHook < TestHook
-    def view_layouts_base_html_head(context)
-      link_to('Issues', :controller => 'issues')
-    end
-  end
-
-  class TestHookHelperController < ActionController::Base
-    include Redmine::Hook::Helper
-  end
-  
-  class TestHookHelperView < ActionView::Base
-    include Redmine::Hook::Helper
-  end
-  
  Redmine::Hook.clear_listeners
  
  def setup
    @hook_module = Redmine::Hook
-    @hook_helper = TestHookHelperController.new
-    @view_hook_helper = TestHookHelperView.new(RAILS_ROOT + '/app/views')
  end
  
  def teardown
@@ -86,81 +67,17 @@ class Redmine::Hook::ManagerTest < Test::Unit::TestCase
  
  def test_call_hook
    @hook_module.add_listener(TestHook1)
-    assert_equal ['Test hook 1 listener.'], @hook_helper.call_hook(:view_layouts_base_html_head)
+    assert_equal 'Test hook 1 listener.', @hook_module.call_hook(:view_layouts_base_html_head)
  end
  
  def test_call_hook_with_context
    @hook_module.add_listener(TestHook3)
-    assert_equal ['Context keys: bar, controller, foo, project, request.'],
-                 @hook_helper.call_hook(:view_layouts_base_html_head, :foo => 1, :bar => 'a')
+    assert_equal 'Context keys: bar, foo.', @hook_module.call_hook(:view_layouts_base_html_head, :foo => 1, :bar => 'a')
  end
  
  def test_call_hook_with_multiple_listeners
    @hook_module.add_listener(TestHook1)
    @hook_module.add_listener(TestHook2)
-    assert_equal ['Test hook 1 listener.', 'Test hook 2 listener.'], @hook_helper.call_hook(:view_layouts_base_html_head)
+    assert_equal 'Test hook 1 listener.Test hook 2 listener.', @hook_module.call_hook(:view_layouts_base_html_head)
  end
-  
-  # Context: Redmine::Hook::Helper.call_hook default_url
-  def test_call_hook_default_url_options
-    @hook_module.add_listener(TestLinkToHook)
-
-    assert_equal ['<a href="/issues">Issues</a>'], @hook_helper.call_hook(:view_layouts_base_html_head)
-  end
-
-  # Context: Redmine::Hook::Helper.call_hook
-  def test_call_hook_with_project_added_to_context
-    @hook_module.add_listener(TestHook3)
-    assert_match /project/i, @hook_helper.call_hook(:view_layouts_base_html_head)[0]
-  end
-  
-  def test_call_hook_from_controller_with_controller_added_to_context
-    @hook_module.add_listener(TestHook3)
-    assert_match /controller/i, @hook_helper.call_hook(:view_layouts_base_html_head)[0]
-  end
-    
-  def test_call_hook_from_controller_with_request_added_to_context
-    @hook_module.add_listener(TestHook3)
-    assert_match /request/i, @hook_helper.call_hook(:view_layouts_base_html_head)[0]
-  end
-    
-  def test_call_hook_from_view_with_project_added_to_context
-    @hook_module.add_listener(TestHook3)
-    assert_match /project/i, @view_hook_helper.call_hook(:view_layouts_base_html_head)
-  end
-    
-  def test_call_hook_from_view_with_controller_added_to_context
-    @hook_module.add_listener(TestHook3)
-    assert_match /controller/i, @view_hook_helper.call_hook(:view_layouts_base_html_head)
-  end
-    
-  def test_call_hook_from_view_with_request_added_to_context
-    @hook_module.add_listener(TestHook3)
-    assert_match /request/i, @view_hook_helper.call_hook(:view_layouts_base_html_head)
-  end
-
-  def test_call_hook_from_view_should_join_responses_with_a_space
-    @hook_module.add_listener(TestHook1)
-    @hook_module.add_listener(TestHook2)
-    assert_equal 'Test hook 1 listener. Test hook 2 listener.',
-                 @view_hook_helper.call_hook(:view_layouts_base_html_head)
-  end
-
-  def test_call_hook_should_not_change_the_default_url_for_email_notifications
-    issue = Issue.find(1)
- 
-    ActionMailer::Base.deliveries.clear
-    Mailer.deliver_issue_add(issue)
-    mail = ActionMailer::Base.deliveries.last
- 
-    @hook_module.add_listener(TestLinkToHook)
-    @hook_helper.call_hook(:view_layouts_base_html_head)
- 
-    ActionMailer::Base.deliveries.clear
-    Mailer.deliver_issue_add(issue)
-    mail2 = ActionMailer::Base.deliveries.last
- 
-    assert_equal mail.body, mail2.body
-   end
 end
-
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -47,11 +47,7 @@ class MailHandlerTest < Test::Unit::TestCase
    assert_equal 'New ticket on a given project', issue.subject
    assert_equal User.find_by_login('jsmith'), issue.author
    assert_equal Project.find(2), issue.project
-    assert_equal IssueStatus.find_by_name('Resolved'), issue.status
    assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
-    # keywords should be removed from the email body
-    assert !issue.description.match(/^Project:/i)
-    assert !issue.description.match(/^Status:/i)
  end

  def test_add_issue_with_status
@@ -92,21 +88,6 @@ class MailHandlerTest < Test::Unit::TestCase
    assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
  end
  
-  def test_add_issue_with_spaces_between_attribute_and_separator
-    issue = submit_email('ticket_with_spaces_between_attribute_and_separator.eml', :allow_override => 'tracker,category,priority')
-    assert issue.is_a?(Issue)
-    assert !issue.new_record?
-    issue.reload
-    assert_equal 'New ticket on a given project', issue.subject
-    assert_equal User.find_by_login('jsmith'), issue.author
-    assert_equal Project.find(2), issue.project
-    assert_equal 'Feature request', issue.tracker.to_s
-    assert_equal 'Stock management', issue.category.to_s
-    assert_equal 'Urgent', issue.priority.to_s
-    assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
-  end
-
-  
  def test_add_issue_with_attachment_to_specific_project
    issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
    assert issue.is_a?(Issue)
@@ -130,7 +111,6 @@ class MailHandlerTest < Test::Unit::TestCase
    issue.reload
    assert_equal 'New ticket with custom field values', issue.subject
    assert_equal 'Value for a custom field', issue.custom_value_for(CustomField.find_by_name('Searchable field')).value
-    assert !issue.description.match(/^searchable field:/i)
  end
  
  def test_add_issue_with_cc
@@ -142,11 +122,6 @@ class MailHandlerTest < Test::Unit::TestCase
    assert_equal 1, issue.watchers.size
  end
  
-  def test_add_issue_without_from_header
-    Role.anonymous.add_permission!(:add_issues)
-    assert_equal false, submit_email('ticket_without_from_header.eml')
-  end
-  
  def test_add_issue_note
    journal = submit_email('ticket_reply.eml')
    assert journal.is_a?(Journal)
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -86,16 +86,6 @@ class MailerTest < Test::Unit::TestCase
    # restore it
    ActionController::AbstractRequest.relative_url_root = relative_url_root
  end
-  
-  def test_email_headers
-    ActionMailer::Base.deliveries.clear
-    issue = Issue.find(1)
-    Mailer.deliver_issue_add(issue)
-    mail = ActionMailer::Base.deliveries.last
-    assert_not_nil mail
-    assert_equal 'bulk', mail.header_string('Precedence')
-    assert_equal 'auto-generated', mail.header_string('Auto-Submitted')
-  end

  def test_plain_text_mail
    Setting.plain_text_mail = 1
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -150,17 +150,15 @@ class QueryTest < Test::Unit::TestCase

  def test_operator_contains
    query = Query.new(:project => Project.find(1), :name => '_')
-    query.add_filter('subject', '~', ['uNable'])
-    assert query.statement.include?("LOWER(#{Issue.table_name}.subject) LIKE '%unable%'")
-    result = find_issues_with_query(query)
-    assert result.empty?
-    result.each {|issue| assert issue.subject.downcase.include?('unable') }
+    query.add_filter('subject', '~', ['string'])
+    assert query.statement.include?("#{Issue.table_name}.subject LIKE '%string%'")
+    find_issues_with_query(query)
  end
  
  def test_operator_does_not_contains
    query = Query.new(:project => Project.find(1), :name => '_')
-    query.add_filter('subject', '!~', ['uNable'])
-    assert query.statement.include?("LOWER(#{Issue.table_name}.subject) NOT LIKE '%unable%'")
+    query.add_filter('subject', '!~', ['string'])
+    assert query.statement.include?("#{Issue.table_name}.subject NOT LIKE '%string%'")
    find_issues_with_query(query)
  end
  
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -67,7 +67,6 @@ class RepositoryTest < Test::Unit::TestCase
  
  def test_scan_changesets_for_issue_ids
    Setting.default_language = 'en'
-    set_language_if_valid('en')
    
    # choosing a status to apply to fix issues
    Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id