mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-26 18:03:39 +01:00
""
This commit is contained in:
parent
1113f2ec1c
commit
82e4a81bc8
@ -1818,10 +1818,13 @@ class etemplate extends boetemplate
|
|||||||
{
|
{
|
||||||
if (strpos($on,'::') !== false) // avoid the expensive regular expresions, for performance reasons
|
if (strpos($on,'::') !== false) // avoid the expensive regular expresions, for performance reasons
|
||||||
{
|
{
|
||||||
if (preg_match("/egw::link\\('([^']+)','(.+?)'\\)/",$on,$matches)) // the ? alters the expression to shortest match
|
if (preg_match_all("/egw::link\\('([^']+)','(.+?)'\\)/",$on,$matches)) // the ? alters the expression to shortest match
|
||||||
{ // this way we can correctly parse ' in the 2. argument
|
{
|
||||||
$url = $GLOBALS['egw']->link($matches[1],$matches[2]);
|
foreach(array_keys($matches[1]) as $n) // this way we can correctly parse ' in the 2. argument
|
||||||
$on = str_replace($matches[0],'\''.$url.'\'',$on);
|
{
|
||||||
|
$url = $GLOBALS['egw']->link($matches[1][$n],$matches[2][$n]);
|
||||||
|
$on = str_replace($matches[0][$n],'\''.$url.'\'',$on);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (preg_match_all("/form::name\\('([^']+)'\\)/",$on,$matches)) {
|
if (preg_match_all("/form::name\\('([^']+)'\\)/",$on,$matches)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user