forked from extern/egroupware
send app-name as get-var to process_exec to allow the changed /index.php to setup for the right app
This commit is contained in:
parent
ee31b85185
commit
37215bffa7
@ -97,14 +97,15 @@
|
|||||||
|
|
||||||
$id = $this->appsession_id();
|
$id = $this->appsession_id();
|
||||||
|
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['etemplate']['loop'] = False;
|
$GLOBALS['phpgw_info']['etemplate']['loop'] = False;
|
||||||
$GLOBALS['phpgw_info']['etemplate']['form_options'] = ''; // might be set in show
|
$GLOBALS['phpgw_info']['etemplate']['form_options'] = ''; // might be set in show
|
||||||
$html .= $this->html->nextMatchStyles($this->style)."\n\n". // so they get included once
|
$html .= $this->html->nextMatchStyles($this->style)."\n\n". // so they get included once
|
||||||
$this->html->form($this->include_java_script() .
|
$this->html->form($this->include_java_script() .
|
||||||
$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,'exec'),
|
$this->show($this->complete_array_merge($content,$changes),$sel_options,$readonlys,'exec'),
|
||||||
array('etemplate_exec_id' => $id),
|
array('etemplate_exec_id' => $id),
|
||||||
'/index.php?menuaction=etemplate.etemplate.process_exec','','eTemplate',
|
'/index.php?menuaction=etemplate.etemplate.process_exec&app='.$GLOBALS['phpgw_info']['flags']['currentapp'],
|
||||||
$GLOBALS['phpgw_info']['etemplate']['form_options']);
|
'','eTemplate',$GLOBALS['phpgw_info']['etemplate']['form_options']);
|
||||||
|
|
||||||
$id = $this->save_appsession($this->as_array(1) + array(
|
$id = $this->save_appsession($this->as_array(1) + array(
|
||||||
'readonlys' => $readonlys,
|
'readonlys' => $readonlys,
|
||||||
@ -170,9 +171,6 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// set application name so that lang, etc. works
|
|
||||||
list($GLOBALS['phpgw_info']['flags']['currentapp']) = explode('.',$session_data['method']);
|
|
||||||
|
|
||||||
ExecMethod($session_data['method'],$this->complete_array_merge($content,$session_data['preserv']));
|
ExecMethod($session_data['method'],$this->complete_array_merge($content,$session_data['preserv']));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user