extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow to specify app in egw::link() pseudo function

Browse Source
This commit is contained in:
Nathan Gray 2012-12-05 18:16:42 +00:00
parent 59c35020e7
commit 661572206c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.etemplate_old.inc.php
View File

@ -2102,12 +2102,12 @@ class etemplate_old 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_all("/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
{ {
foreach(array_keys($matches[1]) as $n) // this way we can correctly parse ' in the 2. argument foreach(array_keys($matches[1]) as $n) // this way we can correctly parse ' in the 2. argument
{ {
$url = $GLOBALS['egw']->link($matches[1][$n],$matches[2][$n]); $url = $GLOBALS['egw']->link($matches[1][$n],$matches[2][$n],$matches[3][$n]);
$on = str_replace($matches[0][$n],'\''.$url.'\'',$on); $on = str_replace($matches[0][$n],'\''.addslashes($url).'\'',$on);
} }
} }