conflict resolution on people search

darcs-hash:20081123190555-099f7-cd09b07e99355e2f61562324221840f869fea5bb.gz
This commit is contained in:
millette 2008-11-23 14:05:55 -05:00
parent 6b29f6ed70
commit 095ff0feed
2 changed files with 2 additions and 2 deletions

View File

@ -20,7 +20,7 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/searchaction.php'); require_once(INSTALLDIR.'/lib/searchaction.php');
define('PROFILES_PER_PAGE', 10); require_once(INSTALLDIR.'/lib/profilelist.php');
class PeoplesearchAction extends SearchAction { class PeoplesearchAction extends SearchAction {

View File

@ -27,7 +27,7 @@ define('AVATAR_MINI_SIZE', 24);
define('MAX_AVATAR_SIZE', 256 * 1024); define('MAX_AVATAR_SIZE', 256 * 1024);
define('NOTICES_PER_PAGE', 20); define('NOTICES_PER_PAGE', 20);
define('PROFILES_PER_PAGE', 10); define('PROFILES_PER_PAGE', 20);
define('FOREIGN_NOTICE_SEND', 1); define('FOREIGN_NOTICE_SEND', 1);
define('FOREIGN_NOTICE_RECV', 2); define('FOREIGN_NOTICE_RECV', 2);