mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Merge
This commit is contained in:
@@ -187,15 +187,12 @@ namespace Orchard.Mvc.Html {
|
|||||||
|
|
||||||
public static string Link(this HtmlHelper htmlHelper, string linkContents, string href, IDictionary<string, object> htmlAttributes)
|
public static string Link(this HtmlHelper htmlHelper, string linkContents, string href, IDictionary<string, object> htmlAttributes)
|
||||||
{
|
{
|
||||||
TagBuilder tagBuilder = new TagBuilder("a")
|
TagBuilder tagBuilder = new TagBuilder("a")
|
||||||
{
|
{ InnerHtml = htmlHelper.Encode(linkContents) };
|
||||||
InnerHtml = htmlHelper.Encode(linkContents)
|
tagBuilder.MergeAttributes(htmlAttributes);
|
||||||
};
|
tagBuilder.MergeAttribute("href", href);
|
||||||
|
return tagBuilder.ToString(TagRenderMode.Normal);
|
||||||
tagBuilder.MergeAttributes(htmlAttributes);
|
}
|
||||||
tagBuilder.MergeAttribute("href", href);
|
|
||||||
return tagBuilder.ToString(TagRenderMode.Normal);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@@ -341,4 +338,4 @@ namespace Orchard.Mvc.Html {
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user