extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge: Fix {{link}} placeholder was incorrectly wrapped in HREF tag. Use {{link/href}} for that now.

Browse Source
This commit is contained in:
nathangray 2020-10-02 12:37:20 -06:00
parent 7db25dce5e
commit baebf56fb2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Storage/Merge.php
View File

@ -439,7 +439,17 @@ abstract class Merge
// Prepend site
if ($link[0] == '/') $link = Api\Framework::getUrl($link);
$array['$$'.($prefix?$prefix.'/':'').$placeholder.'$$'] = Api\Html::a_href(Api\Html::htmlspecialchars($title), $link);
// Formatting
if($matches[2][$i] == 'title')
{
$link = $title;
}
else if($matches[2][$i] == 'href')
{
$link = Api\Html::a_href(Api\Html::htmlspecialchars($title), $link);
}
$array['$$'.($prefix?$prefix.'/':'').$placeholder.'$$'] = $link;
break;
case 'links':
$link_app = $matches[3][$i] ? $matches[3][$i] : '!'.Api\Link::VFS_APPNAME;