Development

Changeset 5077

You must first sign up to be able to contribute.

Changeset 5077

Show
Ignore:
Timestamp:
09/13/07 23:53:47 (1 year ago)
Author:
fabien
Message:

fixed array_merge_recursive causes recursion warnings in sfGuardUser.php (closes #1834)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfGuardPlugin/README

    r5076 r5077  
    329329=== 1.1.11 === 
    330330 
     331 * fabien: fixed array_merge_recursive causes recursion warnings in sfGuardUser.php (closes #1834) 
    331332 * fabien: fixed groups, permissions, and profile saving when sfUser has no primary key (closes #1709) 
    332333 * fabien: added connection parameters to all methods that interacts with the database (closes #2237) 

  • plugins/sfGuardPlugin/lib/model/sfGuardUser.php

    r5076 r5077  
    1919{ 
    2020  protected 
    21     $profile          = null, 
    22     $groups           = null, 
    23     $permissions      = null, 
    24     $groupPermissions = null; 
     21    $profile        = null, 
     22    $groups         = null, 
     23    $permissions    = null, 
     24    $allPermissions = null; 
    2525 
    2626  public function __toString() 
    …… 
    231231  public function getAllPermissions() 
    232232  { 
    233     if (!$this->groupPermissions) 
    234     { 
    235       $this->groupPermissions = array(); 
     233    if (!$this->allPermissions) 
     234    { 
     235      $this->allPermissions = $this->getPermissions(); 
    236236 
    237237      foreach ($this->getGroups() as $group) 
    …… 
    241241          $permission = $gp->getsfGuardPermission(); 
    242242 
    243           $this->groupPermissions[$permission->getName()] = $permission; 
     243          $this->allPermissions[$permission->getName()] = $permission; 
    244244        } 
    245245      } 
    246  
    247       $this->groupPermissions = array_merge_recursive($this->groupPermissions, $this->getPermissions()); 
    248     } 
    249  
    250     return $this->groupPermissions; 
     246    } 
     247 
     248    return $this->allPermissions; 
    251249  } 
    252250 
    …… 
    258256  public function reloadGroupsAndPermissions() 
    259257  { 
    260     $this->groups            = null; 
    261     $this->permissions       = null; 
    262     $this->groupPermissions = null; 
     258    $this->groups         = null; 
     259    $this->permissions    = null; 
     260    $this->allPermissions = null; 
    263261  } 
    264262