commit 4d6478e9ea165bde8dbc5904a154d080b80d77fd Author: Joel Pittet Date: Tue Apr 2 20:56:53 2013 -0700 changes in hopes to fix bugs but sadly, no diff --git a/core/modules/user/templates/user-signature.html.twig b/core/modules/user/templates/user-signature.html.twig index 9f490ef..cac3a68 100644 --- a/core/modules/user/templates/user-signature.html.twig +++ b/core/modules/user/templates/user-signature.html.twig @@ -7,7 +7,7 @@ * - signature: The user's signature. * - attributes: An array of HTML attributes for the wrapper of the signature. * - * @TODO Use a general wrapper instead of this file. + * @todo Use a general wrapper instead of this file. * * @see template_preprocess() * @see template_preprocess_user_signature() @@ -15,4 +15,8 @@ * @ingroup themeable */ #} -{{ signature }} +{% spaceless %} +{% if signature %} +
{{ signature }} +{% endif %} +{% endspaceless %} diff --git a/core/modules/user/templates/user.html.twig b/core/modules/user/templates/user.html.twig index d8b8242..c7a9a0e 100644 --- a/core/modules/user/templates/user.html.twig +++ b/core/modules/user/templates/user.html.twig @@ -6,20 +6,20 @@ * This template is used when viewing a registered user's page, * e.g., example.com/user/123. 123 being the users ID. * - * Use {{ content }} to print all content, or print a subset - * such as {{ content.field_example }}. + * Use 'content' to print all content, or print a subset + * such as 'content.field_example'. * By default, $user_profile['summary'] is provided, which contains data on the - * user's history. Other data can be included by modules. + * user's history. Other data can be included by modules. * * Available variables: * - content: A list of content items. * - Field variables: for each field instance attached to the user a - * corresponding variable is defined; e.g., account.field_example has a - * variable 'field_example' defined. When needing to access a field's raw - * values, developers/themers are strongly encouraged to use these - * variables. Otherwise they will have to explicitly specify the desired - * field language, e.g. account.field_example['en'], thus overriding any - * language negotiation rule that was previously applied. + * corresponding variable is defined; e.g., account.field_example has a + * variable 'field_example' defined. When needing to access a field's raw + * values, developers/themers are strongly encouraged to use these + * variables. Otherwise they will have to explicitly specify the desired + * field language, e.g. account.field_example['en'], thus overriding any + * language negotiation rule that was previously applied. * * @see template_preprocess() * @see template_preprocess_user() diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc index 2cf3f8c..590d65a 100644 --- a/core/modules/user/user.pages.inc +++ b/core/modules/user/user.pages.inc @@ -182,7 +182,8 @@ function user_logout() { * * @param array $variables * An associative array containing: - * - $account + * - account: The user account to check access for + * (Drupal\user\Plugin\Core\Entity\User). */ function template_preprocess_user(&$variables) { $account = $variables['elements']['#user'];