diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-28 20:49:50 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-28 20:49:50 -0700 |
| commit | 3461b4e8e65791ae4e01fd45da5df76a9a929dbf (patch) | |
| tree | 0523422be804d8b6b62f71625796dabc0cf02f72 /modules/watermark/helpers | |
| parent | 2d770f1d2784f5559c3ca892c6cfd8db381f2854 (diff) | |
| parent | 30586236a5b6c71542a02fa13a0018ff4da6eb19 (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") |