Merge branch 'master' of gitorious.org:statusnet/mainline

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/newevent.php b/plugins/Event/newevent.php
index 34e83cd7e099e428747bdb392ab67c171645bb55..4c2157e01eebbe7b63843e820959618300713ade 100644 (file)
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -206,7 +206,7 @@ class NeweventAction extends Action
                 throw new ClientException(_m('Event must have an end time.'));
             }
 
-            if (isset($this->url) && Validate::uri($this->url) === false) {
+            if (!empty($this->url) && Validate::uri($this->url) === false) {
                 // TRANS: Client exception thrown when trying to post an event with an invalid URL.
                 throw new ClientException(_m('URL must be valid.'));
             }