From 64602c83849b29088bfbf60b46a8fb802bcc9860 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 5 Feb 2014 17:26:24 +0100 Subject: [PATCH 1/3] fix referenced documents names --- book/security.rst | 2 +- reference/forms/types/collection.rst | 2 +- reference/forms/types/options/checkbox_empty_data.rst.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/book/security.rst b/book/security.rst index 12a98e7bd1f..758bd7b3878 100644 --- a/book/security.rst +++ b/book/security.rst @@ -1437,7 +1437,7 @@ is available by calling the PHP function :phpfunction:`hash_algos`. .. tip:: It's also possible to use different hashing algorithms on a user-by-user - basis. See :doc:`/cookbook/security/named-encoders` for more details. + basis. See :doc:`/cookbook/security/named_encoders` for more details. Determining the Hashed Password ............................... diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst index 76f91580dc8..f918c6cbf80 100644 --- a/reference/forms/types/collection.rst +++ b/reference/forms/types/collection.rst @@ -379,4 +379,4 @@ error_bubbling .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/type/options/cascade_validation.rst.inc +.. include:: /reference/forms/types/options/cascade_validation.rst.inc diff --git a/reference/forms/types/options/checkbox_empty_data.rst.inc b/reference/forms/types/options/checkbox_empty_data.rst.inc index 8143ad364ce..d7a09ba3b7b 100644 --- a/reference/forms/types/options/checkbox_empty_data.rst.inc +++ b/reference/forms/types/options/checkbox_empty_data.rst.inc @@ -6,4 +6,4 @@ empty_data This option determines what value the field will return when the ``empty_value`` choice is selected. In checkbox, the value of ``empty_data`` is overriden by the value returned by -the data transformer (see :doc:`/cookbook/form/data_transformers.rst`). +the data transformer (see :doc:`/cookbook/form/data_transformers`). From 7e3c0e3af0bc730a4ccc732ee6c46fd9d82a99a9 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 5 Feb 2014 17:27:38 +0100 Subject: [PATCH 2/3] readd configuration block --- cookbook/security/named_encoders.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cookbook/security/named_encoders.rst b/cookbook/security/named_encoders.rst index fe54738f670..cf9ea3770c2 100644 --- a/cookbook/security/named_encoders.rst +++ b/cookbook/security/named_encoders.rst @@ -10,6 +10,10 @@ How to Choose the Password Encoder Algorithm Dynamically Usually, the same password encoder is used for all users by configuring it to apply to all instances of a specific class: +.. configuration-block:: + + .. code-block:: yaml + # app/config/security.yml security: # ... @@ -117,7 +121,7 @@ the name of the encoder to use:: if ($this->isAdmin()) { return 'harsh'; } - + return null; // use the default encoder } } From 46e0b52f66cb2bebbf769c1590c27108a1e257a0 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 5 Feb 2014 17:28:15 +0100 Subject: [PATCH 3/3] remove empty_data from the list of inherited options, it's documented in the overriden options section --- reference/forms/types/checkbox.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst index aeefb915ccf..e39c393dae7 100644 --- a/reference/forms/types/checkbox.rst +++ b/reference/forms/types/checkbox.rst @@ -60,8 +60,6 @@ These options inherit from the :doc:`form ` type: .. include:: /reference/forms/types/options/data.rst.inc -.. include:: /reference/forms/types/options/empty_data.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. include:: /reference/forms/types/options/label.rst.inc pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy