access callback for model types not loading correct object [#1192002]

Comment	File	Size	Author
	model-access.patch	1.24 KB	domidc

Comment #1

ronald_istos commented 21 June 2011 at 17:22

1. user_access loads the user object for you so we don't need to do this again

2. not sure why you think the wrong object is loaded...

Log in or register to post comments

Comment #2

domidc commented 22 June 2011 at 13:27

I mean that the access argument expects the full object instead of just the type. Otherwise later in following function $type_name is not correct.

function model_access($op, $model = NULL, $account = NULL) {
	if (empty($account)) {
	  global $user;
	  $account = $user;
	}
	
  if (user_access('administer models', $account)) {
    return TRUE;
  }
  if (isset($model) && $type_name = $model->type) {
    $op = ($op == 'view') ? 'view' : 'edit';
    if (user_access("$op any $type_name model", $account)) {
      return TRUE;
    }
  }
  return FALSE;
}