diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-10-22 23:36:05 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-10-22 23:36:05 -0600 |
| commit | da73c0c25f406ccef8351be06ab30fd0d71977b8 (patch) | |
| tree | 807315a85edebfe19a07bf766f1764878966bd71 /modules/gallery/helpers | |
| parent | 267c54d4381a9a8522e33f8d877b35adf0615e4c (diff) | |
Poor man's merge. Note to self, git pull before working. Next pound the steps to merge into your head.
Diffstat (limited to 'modules/gallery/helpers')
| -rw-r--r-- | modules/gallery/helpers/module.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/photo.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php index 77ec6f63..5b34f453 100644 --- a/modules/gallery/helpers/module.php +++ b/modules/gallery/helpers/module.php @@ -253,7 +253,7 @@ class module_Core { call_user_func(array($installer_class, "uninstall")); } - graphics::remove_rule($module_name); + graphics::remove_rules($module_name); $module = self::get($module_name); if ($module->loaded) { $module->delete(); diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php index 6677ddc9..d1d8fb1f 100644 --- a/modules/gallery/helpers/photo.php +++ b/modules/gallery/helpers/photo.php @@ -26,7 +26,7 @@ class photo_Core { /** * Create a new photo. - * @param integer $parent_id id of parent album + * @param integer $parent parent album * @param string $filename path to the photo file on disk * @param string $name the filename to use for this photo in the album * @param integer $title the title of the new photo |