mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-27 05:11:41 +02:00
fix to get IE and HTMLarea working together again, HTMLarea seems not to work in IE, if a <base href="..."> is set. This was done to get relative image-pathes working.
This commit is contained in:
parent
78443fcb63
commit
f6b1b8e03e
@ -177,7 +177,7 @@
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
$GLOBALS['phpgw_info']['flags']['java_script'] .=
|
$GLOBALS['phpgw_info']['flags']['java_script'] .=
|
||||||
'<script type="text/javascript" src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['phpgw']->link('/phpgwapi/inc/htmlarea-lang.php',array('lang'=>$lang))).'"></script>'."\n";
|
'<script type="text/javascript" src="'.ereg_replace('[?&]*click_history=[0-9a-f]*','',$GLOBALS['phpgw']->link('/phpgwapi/inc/htmlarea-lang.php',array('lang'=>$lang))).'"></script>'."\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['java_script_thirst'] .=
|
$GLOBALS['phpgw_info']['flags']['java_script_thirst'] .=
|
||||||
@ -189,7 +189,7 @@
|
|||||||
</script>\n";
|
</script>\n";
|
||||||
|
|
||||||
// set a base href to get relative image-pathes working
|
// set a base href to get relative image-pathes working
|
||||||
if ($base_href)
|
if ($base_href && $this->user_agent != 'msie') // HTMLarea does not work in IE with base href set !!!
|
||||||
{
|
{
|
||||||
$GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<base href="'.
|
$GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<base href="'.
|
||||||
($base_href[0] != '/' && substr($base_href,0,4) != 'http' ? $GLOBALS['phpgw_info']['server']['webserver_url'].'/' : '').
|
($base_href[0] != '/' && substr($base_href,0,4) != 'http' ? $GLOBALS['phpgw_info']['server']['webserver_url'].'/' : '').
|
||||||
@ -201,8 +201,6 @@
|
|||||||
htmlareaConfig.editorURL = '."'$this->phpgwapi_js_url/htmlarea/';
|
htmlareaConfig.editorURL = '."'$this->phpgwapi_js_url/htmlarea/';
|
||||||
</script>\n";
|
</script>\n";
|
||||||
}
|
}
|
||||||
// echo $GLOBALS['phpgw_info']['flags']['java_script'];
|
|
||||||
// die('test');
|
|
||||||
$id = str_replace(array('[',']'),array('_',''),$name); // no brakets in the id allowed by js
|
$id = str_replace(array('[',']'),array('_',''),$name); // no brakets in the id allowed by js
|
||||||
|
|
||||||
$GLOBALS['phpgw']->js->set_onload("HTMLArea.replace('$id',htmlareaConfig);");
|
$GLOBALS['phpgw']->js->set_onload("HTMLArea.replace('$id',htmlareaConfig);");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user