diff options
author | Chad Kieffer <ckieffer@gmail.com> | 2009-07-30 17:28:05 -0600 |
---|---|---|
committer | Chad Kieffer <ckieffer@gmail.com> | 2009-07-30 17:28:05 -0600 |
commit | 9d70f142199f4f3c3ec63fcbb125f5c33c91d9ec (patch) | |
tree | 189532a66c8996c6f69003ba01e455ce1b050a4e /modules/watermark/helpers | |
parent | ca4f03b93e1c5eb90d1677684fd5220c000d7d34 (diff) | |
parent | 19d89f94f9939bbd879d6c8ead4e802f592ec808 (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/watermark/helpers')
-rw-r--r-- | modules/watermark/helpers/watermark_event.php (renamed from modules/watermark/helpers/watermark_menu.php) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/watermark/helpers/watermark_menu.php b/modules/watermark/helpers/watermark_event.php index bc3a4fed..45b410f9 100644 --- a/modules/watermark/helpers/watermark_menu.php +++ b/modules/watermark/helpers/watermark_event.php @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class watermark_menu_Core { - static function admin($menu, $theme) { +class watermark_event_Core { + static function admin_menu($menu, $theme) { $menu->get("content_menu") ->append( Menu::factory("link") |