Changeset 26280


Ignore:
Timestamp:
06/05/10 11:36:43 (7 years ago)
Author:
flack
Message:

revert last two commits since they introduced a slight behavior change, also remove some dead code, refs #1848

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ragnaroek/midcom/midcom.core/midcom/core/privilege.php

    r26279 r26280  
    109109        }
    110110
    111         if ($property == '__cached_object')
    112         {
    113             return $this->__cached_object;
    114         }
    115        
    116111        if ($property == 'name')
    117112        {
     
    126121    public function __set($property, $value)
    127122    {
    128         if ($property == '__cached_object')
    129         {
    130             return $this->__cached_object = $value;
    131         }
    132 
    133123        if ($property == 'name')
    134124        {
     
    747737        // assigned to a single object.
    748738        $valid_privileges = array();
     739        $valid_privileges[MIDCOM_PRIVILEGE_SCOPE_OWNER] = $_MIDCOM->auth->get_owner_default_privileges();
    749740
    750741        $object_privileges = midcom_core_privilege::get_content_privileges($guid);
     
    816807        }
    817808
     809
    818810        // Process owner privileges
    819         if ($is_owner)
    820         {
    821             $valid_privileges[MIDCOM_PRIVILEGE_SCOPE_OWNER] = $_MIDCOM->auth->get_owner_default_privileges();
     811        if (! $is_owner)
     812        {
     813            // Drop the owner privileges from the merging chain again, we are not an owner
     814            unset ($valid_privileges[MIDCOM_PRIVILEGE_SCOPE_OWNER]);
    822815        }
    823816
Note: See TracChangeset for help on using the changeset viewer.