holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix refresh of infolog list with wrong url from edit windows, if the list already contained a msg in the url

Browse Source
This commit is contained in:
Ralf Becker 2005-11-18 16:00:37 +00:00
parent c3a9b1c5e8
commit e5047dcd9c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infolog/inc/class.uiinfolog.inc.php
View File

@ -485,7 +485,7 @@
else
{
$content['msg'] = lang('InfoLog entry saved');
$content['js'] = "opener.location.href='".$GLOBALS['egw']->link($referer,array('msg' => $content['msg']))."';";
$content['js'] = "opener.location.href='".($link=$GLOBALS['egw']->link($referer,array('msg' => $content['msg'])))."';";
}
if ($info_id && $first_link_to) // writing links for a new entry
{
@ -543,9 +543,9 @@
$action_id = $action_id ? $action_id : get_var('action_id',array('POST','GET'));
$info_id = $content ? $content : get_var('info_id', array('POST','GET'));
$type = $type ? $type : get_var('type', array('POST','GET'));
$referer = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
$ref=$referer = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
$GLOBALS['egw']->common->get_referer('/index.php?menuaction=infolog.uiinfolog.index'));
$referer = preg_replace('/[&?]{1}msg=[^&]+/','',$referer); // remove previou/old msg from referer
$referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer); // remove previou/old msg from referer
$no_popup = $_GET['no_popup'];
//echo "<p>uiinfolog::edit: info_id=$info_id, action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";