From de21d661570c24e74a9d684b62b014ad8b072923 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 14 Sep 2011 16:25:50 -0700 Subject: [PATCH 1/5] Fix undefined variable --- lib/groupprofileblock.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php index df383f0696..fc0679247b 100644 --- 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'); From a4593f9cd33905124042dd95d4b849853c3dc394 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Sat, 17 Sep 2011 13:36:05 -0700 Subject: [PATCH 2/5] Don't try to verify URL if the user has left it out when making a new event --- plugins/Event/newevent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php index 34e83cd7e0..4c2157e01e 100644 --- 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.')); } From edbe03b193dec4b9ca3ff8044f2e87a77caa9cd9 Mon Sep 17 00:00:00 2001 From: Samantha Doherty Date: Sat, 17 Sep 2011 18:26:54 -0400 Subject: [PATCH 3/5] Minor layout fix for shownotice page. --- theme/base/css/display.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f5638e58ab..7a05802114 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -74,7 +74,7 @@ select { padding-bottom: 0px; margin-top: -4px; } - +s option { padding-bottom: 0px; } @@ -700,10 +700,6 @@ font-style:italic; min-height: 1em; } -#shownotice .vcard .photo { - margin-bottom: 4px; -} - #shownotice .notice .entry-title { font-size:2.2em; min-height:123px; From 5463c7f4f57c5780cc5c9b109d17d75fd2e5180c Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Sun, 18 Sep 2011 13:35:09 -0700 Subject: [PATCH 4/5] Reorder directory router connections / fix regex --- plugins/Directory/DirectoryPlugin.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php index 06cfca02ef..5979bb0e80 100644 --- a/plugins/Directory/DirectoryPlugin.php +++ b/plugins/Directory/DirectoryPlugin.php @@ -115,21 +115,20 @@ class DirectoryPlugin extends Plugin { $m->connect( - 'directory/users', + 'directory/users/:filter', array('action' => 'userdirectory'), - array('filter' => 'all') + array('filter' => '[0-9a-zA-Z]|(0-9)') ); $m->connect( - 'directory/users/:filter', - array('action' => 'userdirectory'), - array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)') + 'directory/users', + array('action' => 'userdirectory') ); $m->connect( 'groups/:filter', array('action' => 'groupdirectory'), - array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)') + array('filter' => '[0-9a-zA-Z]|(0-9)') ); $m->connect( From 56c63159681bf881c078e79350b753bd850f698d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Sun, 18 Sep 2011 14:17:41 -0700 Subject: [PATCH 5/5] Remove fulltext indexes from notice and profile tables. The default for fulltext search is 'like' (MySQLLikeSearch) which doesn't require them. --- classes/Notice.php | 3 --- classes/Profile.php | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index e34dab549f..a38f54f050 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -127,9 +127,6 @@ class Notice extends Managed_DataObject 'notice_created_idx' => array('created'), 'notice_replyto_idx' => array('reply_to'), 'notice_repeatof_idx' => array('repeat_of'), - ), - 'fulltext indexes' => array( - 'content' => array('content'), ) ); } diff --git a/classes/Profile.php b/classes/Profile.php index 5ace57004c..8cea91ece6 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -72,10 +72,7 @@ class Profile extends Managed_DataObject 'primary key' => array('id'), 'indexes' => array( 'profile_nickname_idx' => array('nickname'), - ), - 'fulltext indexes' => array( - 'nickname' => array('nickname', 'fullname', 'location', 'bio', 'homepage') - ), + ) ); }