equal
deleted
inserted
replaced
3089 * @param bool $is_everyone If true, applies exceptions for "Everyone" group |
3089 * @param bool $is_everyone If true, applies exceptions for "Everyone" group |
3090 * @param array|reference $defaults_used Array that will be filled with default usage data |
3090 * @param array|reference $defaults_used Array that will be filled with default usage data |
3091 * @return array |
3091 * @return array |
3092 */ |
3092 */ |
3093 |
3093 |
3094 function acl_merge($perm1, $perm2, $is_everyone = false, &$defaults_used) |
3094 function acl_merge($perm1, $perm2, $is_everyone = false, &$defaults_used = array()) |
3095 { |
3095 { |
3096 $ret = $perm1; |
3096 $ret = $perm1; |
3097 if ( !is_array(@$defaults_used) ) |
3097 if ( !is_array(@$defaults_used) ) |
3098 { |
3098 { |
3099 $defaults_used = array(); |
3099 $defaults_used = array(); |