GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Evan Prodromou 2011-09-18 17:33:38 -04:00
parent cf2457f03f 3bf3b6686c
commit e2914189f3
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/Notice.php
View File

@ -127,9 +127,6 @@ class Notice extends Managed_DataObject
'notice_created_idx' => array('created'), 'notice_created_idx' => array('created'),
'notice_replyto_idx' => array('reply_to'), 'notice_replyto_idx' => array('reply_to'),
'notice_repeatof_idx' => array('repeat_of'), 'notice_repeatof_idx' => array('repeat_of'),
),
'fulltext indexes' => array(
'content' => array('content'),
) )
); );
} }

5
classes/Profile.php
View File

@ -72,10 +72,7 @@ class Profile extends Managed_DataObject
'primary key' => array('id'), 'primary key' => array('id'),
'indexes' => array( 'indexes' => array(
'profile_nickname_idx' => array('nickname'), 'profile_nickname_idx' => array('nickname'),
), )
'fulltext indexes' => array(
'nickname' => array('nickname', 'fullname', 'location', 'bio', 'homepage')
),
); );
} }

11
plugins/Directory/DirectoryPlugin.php
View File

@ -115,21 +115,20 @@ class DirectoryPlugin extends Plugin
{ {
$m->connect( $m->connect(
'directory/users', 'directory/users/:filter',
array('action' => 'userdirectory'), array('action' => 'userdirectory'),
array('filter' => 'all') array('filter' => '[0-9a-zA-Z]|(0-9)')
); );
$m->connect( $m->connect(
'directory/users/:filter', 'directory/users',
array('action' => 'userdirectory'), array('action' => 'userdirectory')
array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)')
); );
$m->connect( $m->connect(
'groups/:filter', 'groups/:filter',
array('action' => 'groupdirectory'), array('action' => 'groupdirectory'),
array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)') array('filter' => '[0-9a-zA-Z]|(0-9)')
); );
$m->connect( $m->connect(