From 52786985104424e6738e079b22b319353030af9f Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Thu, 10 Mar 2016 16:05:49 +0000 Subject: [PATCH] Issue #2679953 by malavya, subharanjan, AjitS, aditya_anurag, mikebell_, jhodgdon: Replace mentions of url() in docs --- core/includes/common.inc | 2 +- core/includes/form.inc | 4 ++-- .../menu_link_content/src/Plugin/migrate/source/MenuLink.php | 2 +- core/modules/system/system.module | 4 ++-- core/modules/user/templates/username.html.twig | 4 ++-- core/themes/classy/templates/user/username.html.twig | 4 ++-- core/themes/stable/templates/user/username.html.twig | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/includes/common.inc b/core/includes/common.inc index 5d62aad4e2e..5cd3ce88385 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -133,7 +133,7 @@ const JS_THEME = 100; const LOCALE_PLURAL_DELIMITER = PluralTranslatableMarkup::DELIMITER; /** - * Prepares a 'destination' URL query parameter for use with url(). + * Prepares a 'destination' URL query parameter. * * Used to direct the user back to the referring page after completing a form. * By default the current URL is returned. If a destination exists in the diff --git a/core/includes/form.inc b/core/includes/form.inc index c1c82c16b10..daf75cd2421 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -687,8 +687,8 @@ function template_preprocess_form_element_label(&$variables) { * .module file. The path should be relative to base_path(), and thus should * be built using drupal_get_path(). * - css: Array of paths to CSS files to be used on the progress page. - * - url_options: options passed to url() when constructing redirect URLs for - * the batch. + * - url_options: options passed to the \Drupal\Core\Url object when + * constructing redirect URLs for the batch. * - progressive: A Boolean that indicates whether or not the batch needs to * run progressively. TRUE indicates that the batch will run in more than * one run. FALSE (default) indicates that the batch will finish in a single diff --git a/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php index 54c9a201177..736c0208561 100644 --- a/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php +++ b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php @@ -51,7 +51,7 @@ class MenuLink extends DrupalSqlBase { 'link_path' => t('The Drupal path or external path this link points to.'), 'router_path' => t('For links corresponding to a Drupal path (external = 0), this connects the link to a {menu_router}.path for joins.'), 'link_title' => t('The text displayed for the link, which may be modified by a title callback stored in {menu_router}.'), - 'options' => t('A serialized array of options to be passed to the url() or l() function, such as a query string or HTML attributes.'), + 'options' => t('A serialized array of options to set on the URL, such as a query string or HTML attributes.'), 'module' => t('The name of the module that generated this link.'), 'hidden' => t('A flag for whether the link should be rendered in menus. (1 = a disabled menu item that may be shown on admin screens, -1 = a menu callback, 0 = a normal, visible link)'), 'external' => t('A flag to indicate if the link points to a full URL starting with a protocol, like http:// (1 = external, 0 = internal).'), diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 2572a39d435..d0ff53fdda6 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -414,7 +414,7 @@ function system_authorized_init($callback, $file, $arguments = array(), $page_ti * Return the URL for the authorize.php script. * * @param array $options - * Optional array of options to pass to url(). + * Optional array of options to set on the \Drupal\Core\Url object. * @return \Drupal\Core\Url * The full URL to authorize.php, using HTTPS if available. * @@ -433,7 +433,7 @@ function system_authorized_get_url(array $options = array()) { * Returns the URL for the authorize.php script when it is processing a batch. * * @param array $options - * Optional array of options to pass to url(). + * Optional array of options to set on the \Drupal\Core\Url object. * * @return \Drupal\Core\Url */ diff --git a/core/modules/user/templates/username.html.twig b/core/modules/user/templates/username.html.twig index 5d4f2f75fea..6c1fccbfff1 100644 --- a/core/modules/user/templates/username.html.twig +++ b/core/modules/user/templates/username.html.twig @@ -9,8 +9,8 @@ * - extra: Additional text to append to the user's name, sanitized. * - link_path: The path or URL of the user's profile page, home page, * or other desired page to link to for more information about the user. - * - link_options: Options to pass to the url() function's $options parameter if - * linking the user's name to the user's page. + * - link_options: Options to set on the \Drupal\Core\Url object if linking the + * user's name to the user's page. * - attributes: HTML attributes for the containing element. * * @see template_preprocess_username() diff --git a/core/themes/classy/templates/user/username.html.twig b/core/themes/classy/templates/user/username.html.twig index 3ed5c95cb3e..5a6c3a55209 100644 --- a/core/themes/classy/templates/user/username.html.twig +++ b/core/themes/classy/templates/user/username.html.twig @@ -9,8 +9,8 @@ * - extra: Additional text to append to the user's name, sanitized. * - link_path: The path or URL of the user's profile page, home page, * or other desired page to link to for more information about the user. - * - link_options: Options to pass to the url() function's $options parameter if - * linking the user's name to the user's page. + * - link_options: Options to set on the \Drupal\Core\Url object if linking the + * user's name to the user's page. * - attributes: HTML attributes for the containing element. * * @see template_preprocess_username() diff --git a/core/themes/stable/templates/user/username.html.twig b/core/themes/stable/templates/user/username.html.twig index 828f6c6e6c8..480225f15d1 100644 --- a/core/themes/stable/templates/user/username.html.twig +++ b/core/themes/stable/templates/user/username.html.twig @@ -9,8 +9,8 @@ * - extra: Additional text to append to the user's name, sanitized. * - link_path: The path or URL of the user's profile page, home page, * or other desired page to link to for more information about the user. - * - link_options: Options to pass to the url() function's $options parameter if - * linking the user's name to the user's page. + * - link_options: Options to set on the \Drupal\Core\Url object if linking the + * user's name to the user's page. * - attributes: HTML attributes for the containing element. * * @see template_preprocess_username()