Commit e3da79e2 authored by Dries's avatar Dries

- Patch #720226 by trevjs: documentation for l() missing language key.

parent a26bd1e3
...@@ -1921,8 +1921,10 @@ function format_username($account) { ...@@ -1921,8 +1921,10 @@ function format_username($account) {
* - 'alias': Defaults to FALSE. Whether the given path is a URL alias * - 'alias': Defaults to FALSE. Whether the given path is a URL alias
* already. * already.
* - 'external': Whether the given path is an external URL. * - 'external': Whether the given path is an external URL.
* - 'language': An optional language object. Used to build the URL to link * - 'language': An optional language object. If the path being linked to is
* to and look up the proper alias for the link. * internal to the site, $options['language'] is used to look up the alias
* for the URL. If $options['language'] is omitted, the global $language
* will be used.
* - 'https': Whether this URL should point to a secure location. If not * - 'https': Whether this URL should point to a secure location. If not
* defined, the current scheme is used, so the user stays on http or https * defined, the current scheme is used, so the user stays on http or https
* respectively. TRUE enforces HTTPS and FALSE enforces HTTP, but HTTPS can * respectively. TRUE enforces HTTPS and FALSE enforces HTTP, but HTTPS can
...@@ -2147,24 +2149,27 @@ function drupal_attributes(array $attributes = array()) { ...@@ -2147,24 +2149,27 @@ function drupal_attributes(array $attributes = array()) {
* used as is. * used as is.
* @param $options * @param $options
* An associative array of additional options, with the following keys: * An associative array of additional options, with the following keys:
* - 'attributes' * - attributes: An associative array of HTML attributes to apply to the
* An associative array of HTML attributes to apply to the anchor tag. * anchor tag.
* - 'query' * - query: A query string to append to the link, or an array of query
* A query string to append to the link, or an array of query key/value * key/value properties.
* properties. * - fragment: A fragment identifier (named anchor) to append to the link.
* - 'fragment'
* A fragment identifier (named anchor) to append to the link.
* Do not include the '#' character. * Do not include the '#' character.
* - 'absolute' (default FALSE) * - absolute: (default FALSE) Whether to force the output to be an absolute
* Whether to force the output to be an absolute link (beginning with * link (beginning with http:). Useful for links that will be displayed
* http:). Useful for links that will be displayed outside the site, such * outside the site, such as in an RSS feed.
* as in an RSS feed. * - html: (default FALSE) Whether $text is HTML, or just plain-text. For
* - 'html' (default FALSE) * example for making an image a link, this must be set to TRUE, or else
* Whether $text is HTML, or just plain-text. For example for making * you will see the escaped HTML.
* an image a link, this must be set to TRUE, or else you will see the * - alias: (default FALSE) Whether the given path is an alias already.
* escaped HTML. * - language: An optional language object. If the path being linked to is
* - 'alias' (default FALSE) * internal to the site, $options['language'] is used to look up the alias
* Whether the given path is an alias already. * for the URL, and to determine whether the link is "active", or pointing
* to the current page (the language as well as the path must match). If
* $options['language'] is omitted, the language defined by the current
* page's URL will be used; this depends on the site's language
* negotiation settings (sub-domain or URL prefix).
*
* @return * @return
* an HTML string containing a link to the given path. * an HTML string containing a link to the given path.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment