Reverted r19669 and r19670 (#32774).

git-svn-id: http://svn.redmine.org/redmine/trunk@19675 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 2 insertions, 11 deletions

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 6379c4511..d304fe3b2 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -279,9 +279,8 @@ class TimelogController < ApplicationController
   end
 
   def find_optional_issue
-    if params[:issue_id].present? || params[:time_entry].present? && params[:time_entry][:issue_id].present?
-      issue_id = params[:issue_id] ||  params[:time_entry][:issue_id]
-      @issue = Issue.find(issue_id)
+    if params[:issue_id].present?
+      @issue = Issue.find(params[:issue_id])
       @project = @issue.project
       authorize
     else
@@ -289,14 +288,6 @@ class TimelogController < ApplicationController
     end
   end
 
-  def find_optional_project
-    if params[:project_id].present? || params[:time_entry].present? && params[:time_entry][:project_id].present?
-      project_id = params[:project_id] || params[:time_entry][:project_id]
-      find_project(project_id)
-    end
-    authorize_global
-  end
-
   # Returns the TimeEntry scope for index and report actions
   def time_entry_scope(options={})
     @query.results_scope(options)