From d9828839594ac2d4202624fc23e6bb6ff11e9419 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 6 May 2011 18:13:10 +0000
Subject: [PATCH] renamed 'action' to 'multi_action', as InfoLog already uses
 'action' and using 'action' broke a lot existing functionality

---
 infolog/inc/class.infolog_ui.inc.php           |  17 +++++++++--------
 infolog/templates/default/images/completed.png | Bin 235 -> 0 bytes
 2 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 infolog/templates/default/images/completed.png

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index e57db62aec..d4bd5b6d74 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -273,6 +273,7 @@ class infolog_ui
 			egw_cache::setSession('infolog', $query['session_for'].'session_data', $query);
 			$query['actions'] = $this->get_actions($query);
 			$query['row_id'] = 'info_id';
+			$query['action_var'] = 'multi_action';	// as 'action' is already used in infolog
 		}
 		$orginal_colfilter = $query['col_filter'];
 		if ($query['filter'] == 'bydate')
@@ -499,13 +500,13 @@ class infolog_ui
 				if(isset($values['nm']['rows'][$button]))
 				{
 					list($id) = @each($values['nm']['rows'][$button]);
-					$values['nm']['action'] = $button;
+					$values['nm']['multi_action'] = $button;
 					$values['nm']['selected'] = array($id);
 					break; // Only one can come per submit
 				}
 			}
 		}
-		if (is_array($values) && !empty($values['nm']['action']))
+		if (is_array($values) && !empty($values['nm']['multi_action']))
 		{
 			if (!count($values['nm']['selected']) && !$values['nm']['select_all'])
 			{
@@ -514,19 +515,19 @@ class infolog_ui
 			else
 			{
 				// Some processing to add values in for links and cats
-				$multi_action = $values['nm']['action'];
+				$multi_action = $values['nm']['multi_action'];
 				// Action has an additional action - add / delete, etc.  Buttons named <multi-action>_action[action_name]
 				if(in_array($multi_action, array('link', 'responsible')))
 				{
-					$values['nm']['action'] .= '_' . key($values[$multi_action . '_action']);
+					$values['nm']['multi_action'] .= '_' . key($values[$multi_action . '_action']);
 
 					if(is_array($values[$multi_action]))
 					{
 						$values[$multi_action] = implode(',',$values[$multi_action]);
 					}
-					$values['nm']['action'] .= '_' . $values[$multi_action];
+					$values['nm']['multi_action'] .= '_' . $values[$multi_action];
 				}
-				if ($this->action($values['nm']['action'], $values['nm']['selected'], $values['nm']['select_all'],
+				if ($this->action($values['nm']['multi_action'], $values['nm']['selected'], $values['nm']['select_all'],
 					$success, $failed, $action_msg, $values['nm'], $msg, $values['nm']['checkboxes']['no_notifications']))
 				{
 					$msg .= lang('%1 entries %2',$success,$action_msg);
@@ -535,7 +536,7 @@ class infolog_ui
 				{
 					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
 				}
-				unset($values['nm']['action']);
+				unset($values['nm']['multi_action']);
 				unset($values['nm']['select_all']);
 			}
 			$values['msg'] = $msg;
@@ -594,7 +595,7 @@ class infolog_ui
 			}
 			elseif ($values['cancel'] && $own_referer)
 			{
-				unset($values['nm']['action']);
+				unset($values['nm']['multi_action']);
 				unset($values['nm']['action_id']);
 				egw_cache::setSession('infolog', $values['nm']['session_for'].'session_data', $values['nm']);
 				$this->tmpl->location($own_referer);
diff --git a/infolog/templates/default/images/completed.png b/infolog/templates/default/images/completed.png
deleted file mode 100644
index aff8f629bb48a5e8c3427775c69a99b8badae563..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*5S+
zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8NyG3q4&NLn>}1{rUgj
zo>{e_v(f3miSx(5PY(CtasBZB`+Jwnf1jRmGdFM9^5s7e7$+QLX#}$C#b#uxOG-YR
zQ_sW0lLN%RTw3_KjhJsT1Tjy1v!Y@51O7=0XSh`)6a3Pu7FbA0vfHTkNgX)AAi)q`
W7|Q>Wv$6wdIfJLGpUXO@geCxjrcMw5