Skip to content

Commit

Permalink
Fixing docblock to reflect change from '*' to 'all'. Adding note abou…
Browse files Browse the repository at this point in the history
…t constant.
  • Loading branch information
markstory committed Feb 4, 2011
1 parent 8285189 commit 2f91767
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions cake/libs/controller/components/auth.php
Expand Up @@ -65,11 +65,11 @@ class AuthComponent extends Component {
*
* Using the class name without 'Authenticate' as the key, you can pass in an array of settings for each
* authentication object. Additionally you can define settings that should be set to all authentications objects
* using the '*' key:
* using the 'all' key:
*
* {{{
* $this->Auth->authenticate = array(
* '*' => array(
* 'all' => array(
* 'userModel' => 'Users.User',
* 'scope' => array('User.active' => 1)
* ),
Expand All @@ -78,6 +78,8 @@ class AuthComponent extends Component {
* );
* }}}
*
* You can also use AuthComponent::ALL instead of the string 'all'.
*
* @var array
* @link http://book.cakephp.org/view/1278/authenticate
*/
Expand All @@ -104,18 +106,20 @@ class AuthComponent extends Component {
*
* Using the class name without 'Authorize' as the key, you can pass in an array of settings for each
* authorization object. Additionally you can define settings that should be set to all authorization objects
* using the '*' key:
* using the 'all' key:
*
* {{{
* $this->Auth->authorize = array(
* '*' => array(
* 'all' => array(
* 'actionPath' => 'controllers/'
* ),
* 'Crud',
* 'CustomAuth'
* );
* }}}
*
* You can also use AuthComponent::ALL instead of the string 'all'
*
* @var mixed
* @link http://book.cakephp.org/view/1275/authorize
*/
Expand Down

0 comments on commit 2f91767

Please sign in to comment.