Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Event / EventPlugin.php

diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index 859422e7d81f927fad98147bb7b52d1a0cb8ff4f..a1d0761a4a03ce9042c23eab590b811b765e17da 100644 (file)
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -67,6 +67,12 @@ class EventPlugin extends MicroAppPlugin
         return true;
     }
 
+    public function onBeforePluginCheckSchema()
+    {
+        RSVP::beforeSchemaUpdate();
+        return true;
+    }
+
     /**
      * Map URLs to actions
      *
@@ -90,6 +96,10 @@ class EventPlugin extends MicroAppPlugin
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
         $m->connect('main/event/updatetimes',
                     array('action' => 'timelist'));
+
+        $m->connect(':nickname/events',
+                    array('action' => 'events'),
+                    array('nickname' => Nickname::DISPLAY_FMT));
         return true;
     }
 
@@ -516,4 +526,14 @@ class EventPlugin extends MicroAppPlugin
         $out->raw($rsvp->asHTML());
         $out->elementEnd('div');
     }
+
+    function onEndPersonalGroupNav(Menu $menu, Profile $target, Profile $scoped=null)
+    {
+        $menu->menuItem(common_local_url('events', array('nickname' => $target->getNickname())),
+                          // TRANS: Menu item in sample plugin.
+                          _m('Happenings'),
+                          // TRANS: Menu item title in sample plugin.
+                          _m('A list of your events'), false, 'nav_timeline_events');
+        return true;
+    }
 }