diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-23 19:44:40 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-23 19:44:40 +0200 |
| commit | b181707c1651af8737c2e6ff550fd20f480b781b (patch) | |
| tree | a39b32912bdb37cbf213d146d8be47f028e88590 /modules/gallery | |
| parent | 386130114b3e3a9cf1617a1ea62407f569ee391c (diff) | |
| parent | 070884d9e248ba692e49949851099e4d79285ef2 (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/helpers/access.php
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/helpers/access.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php index b5be192c..c84527f4 100644 --- a/modules/gallery/helpers/access.php +++ b/modules/gallery/helpers/access.php @@ -142,7 +142,7 @@ class access_Core { * @param Group_Model $group * @param string $perm_name * @param Item_Model $item - * @return boolean access::ALLOW, ccess::DENY or access::INHERIT (null) for no intent + * @return boolean access::ALLOW, access::DENY or access::INHERIT (null) for no intent */ static function group_intent($group, $perm_name, $item) { $intent = model_cache::get("access_intent", $item->id, "item_id"); |