diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 43bc90d110..9c17aae56f 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -701,9 +701,9 @@ class infolog_ui if (!$values['nm']['session_for'] && $this->called_by) $values['nm']['session_for'] = $this->called_by; $values['msg'] = $_GET['msg']; - $values['action'] = $action; - $values['action_id'] = $action_id; - $values['action_title'] = $action_title; + $action_id = $values['action_id'] = $action ? $action_id : $nm['action_id']; + $action_title = $values['action_title'] = $action ? $action_title : $nm['action_title']; + $action = $values['action'] = $action ? $action : $nm['action']; } if($_GET['search']) $values['nm']['search'] = $_GET['search']; @@ -1751,6 +1751,11 @@ class infolog_ui case 'copy': $info_id = 0; $this->create_copy($content, $action == 'sp'); + if ($action == 'sp') // for sub-entries use type or category, like for new entries + { + if ($type) $content['info_type'] = $type; + if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int) $_REQUEST['cat_id']; + } unset($action); // it get stored in $content and will cause an other copy after [apply] break; diff --git a/infolog/index.php b/infolog/index.php index 059ad184f1..606a496ddb 100644 --- a/infolog/index.php +++ b/infolog/index.php @@ -5,7 +5,7 @@ * @link http://www.egroupware.org * @author Ralf Becker * @package infolog - * @copyright (c) 2003-8 by Ralf Becker + * @copyright (c) 2003-12 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @version $Id$ */