From ea5d4651e52b13c345f6cbfc96b39e3ee18a5512 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 Nov 2024 09:36:11 +0100
Subject: [PATCH] fix merge errors

---
 views/bootstrap/class.Tasks.php | 37 ---------------------------------
 1 file changed, 37 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index b359f66fe..4c778b8cd 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -208,43 +208,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 		$workflowmode = $this->params['workflowmode'];
 		$tasksinmenu = $this->params['tasksinmenu'];
 
-		$startts = microtime(true);
-		$tasks = array();
-		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
-			if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
-				$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
-			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
-				$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
-			}
-		if($workflowmode == 'advanced')
-			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
-				$tasks['workflow'] = $dms->countTasks('WorkflowByMe', $user);
-			}
-
-		header('Content-Type: application/json');
-		echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));
-	} /* }}} */
-
-	/**
-	 * Returns the html needed for the task list in the menu
-	 *
-	 * This function renders the tasks in a way suitable to be
-	 * used as a menu
-	 *
-	 * @param array $clipboard clipboard containing two arrays for both
-	 *        documents and folders.
-	 * @return string html code
-	 */
-	function countTasks() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
-		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
-		$workflowmode = $this->params['workflowmode'];
-		$tasksinmenu = $this->params['tasksinmenu'];
-
 		$startts = microtime(true);
 		$tasks = array();
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')