diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-09-21 21:29:13 -0700 |
| commit | e5a78d39ec49332054cbc1a398d7c110e1d9191c (patch) | |
| tree | c2acb4731a381b7a1b28fa5ed505a76adb23a3ef /modules/gallery/controllers/permissions.php | |
| parent | 529ded3388673036314eefd5bfb1cfc0b76f7f9e (diff) | |
| parent | 33690a32bcf132e5ab470ff77ba23c073ac26271 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/albums.php
Diffstat (limited to 'modules/gallery/controllers/permissions.php')
| -rw-r--r-- | modules/gallery/controllers/permissions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php index 5f4620b2..8d75862e 100644 --- a/modules/gallery/controllers/permissions.php +++ b/modules/gallery/controllers/permissions.php @@ -81,7 +81,7 @@ class Permissions_Controller extends Controller { } } - function _get_form($item) { + private function _get_form($item) { $view = new View("permissions_form.html"); $view->item = $item; $view->groups = ORM::factory("group")->find_all(); |