mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 09:09:04 +01:00
Merge: Fix {{link}} placeholder was incorrectly wrapped in HREF tag. Use {{link/href}} for that now.
This commit is contained in:
parent
7db25dce5e
commit
baebf56fb2
@ -439,7 +439,17 @@ abstract class Merge
|
|||||||
// Prepend site
|
// Prepend site
|
||||||
if ($link[0] == '/') $link = Api\Framework::getUrl($link);
|
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;
|
break;
|
||||||
case 'links':
|
case 'links':
|
||||||
$link_app = $matches[3][$i] ? $matches[3][$i] : '!'.Api\Link::VFS_APPNAME;
|
$link_app = $matches[3][$i] ? $matches[3][$i] : '!'.Api\Link::VFS_APPNAME;
|
||||||
|
Loading…
Reference in New Issue
Block a user