From: millette <millette@controlyourself.ca>
Date: Sun, 23 Nov 2008 19:05:55 +0000 (-0500)
Subject: conflict resolution on people search
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=095ff0feedac05e8dee04927bf4da0ae3ffb6a62;p=quix0rs-gnu-social.git

conflict resolution on people search

darcs-hash:20081123190555-099f7-cd09b07e99355e2f61562324221840f869fea5bb.gz
---

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index f4886fd835..2e54233ec1 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -20,7 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/searchaction.php');
-define('PROFILES_PER_PAGE', 10);
+require_once(INSTALLDIR.'/lib/profilelist.php');
 
 class PeoplesearchAction extends SearchAction {
 
diff --git a/lib/common.php b/lib/common.php
index 9b4751c9ff..e710ce4842 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -27,7 +27,7 @@ define('AVATAR_MINI_SIZE', 24);
 define('MAX_AVATAR_SIZE', 256 * 1024);
 
 define('NOTICES_PER_PAGE', 20);
-define('PROFILES_PER_PAGE', 10);
+define('PROFILES_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);