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

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'),
             )
         );
     }

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')
-            ),
+            )
         );
     }
 

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(