Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php
index df383f06964ecf840bb38ac03d80d670ca5184ac..fc0679247b933665e6306ab00483927700f81193 100644 (file)
--- a/lib/groupprofileblock.php
+++ b/lib/groupprofileblock.php
@@ -117,7 +117,7 @@ class GroupProfileBlock extends ProfileBlock
                                                                           array('nickname' => $this->group->nickname)),
                                                // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
                                                // TRANS: %s is the nickname of the group.
-                                               'title' => sprintf(_m('TOOLTIP','Edit %s group properties'), $nickname)),
+                                               'title' => sprintf(_m('TOOLTIP','Edit %s group properties'), $this->group->nickname)),
                                     // TRANS: Link text for link on user profile.
                                     _m('BUTTON','Edit'));
                 $this->out->elementEnd('li');
@@ -126,7 +126,7 @@ class GroupProfileBlock extends ProfileBlock
                                                                           array('nickname' => $this->group->nickname)),
                                                // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
                                                // TRANS: %s is the nickname of the group.
-                                               'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $nickname)),
+                                               'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $this->group->nickname)),
                                     // TRANS: Link text for link on user profile.
                                     _m('MENU','Logo'));
                 $this->out->elementEnd('li');

diff --git a/plugins/Event/eventform.php b/plugins/Event/eventform.php
index f62571ce63eb2495e74d34d9868abbac82cdae3f..8100e5903bc0df5fafb02b78dc92427f89472f46 100644 (file)
--- a/plugins/Event/eventform.php
+++ b/plugins/Event/eventform.php
@@ -124,7 +124,7 @@ class EventForm extends Form
         $this->li();
 
         $times = EventTimeList::getTimes($today->format('m/d/Y 12:00') . ' am ' . $today->format('T'));
-        $start = EventTimeList::nearestHalfHour('@' . $today->getTimestamp());
+        $start = EventTimeList::nearestHalfHour($today->format('c'));
         $start->setTimezone(new DateTimeZone(common_timezone()));
 
         $this->out->dropdown(
@@ -160,7 +160,7 @@ class EventForm extends Form
             'event-endtime',
             // TRANS: Field label on event form.
             _m('LABEL','End time'),
-            EventTimeList::getTimes('@' . $start->getTimestamp(), true),
+            EventTimeList::getTimes($start->format('c'), true),
             // TRANS: Field title on event form.
             _m('Time the event ends.'),
             false,