summaryrefslogtreecommitdiff
path: root/actions/peoplesearch.php
diff options
context:
space:
mode:
authormillette <millette@controlyourself.ca>2008-11-23 14:05:55 -0500
committermillette <millette@controlyourself.ca>2008-11-23 14:05:55 -0500
commit095ff0feedac05e8dee04927bf4da0ae3ffb6a62 (patch)
tree3084df345e57f96e036e0c704d998dd6e290f61f /actions/peoplesearch.php
parent6b29f6ed702f69a9b1b6a9359c1eaa22b9c5ba9d (diff)
conflict resolution on people search
darcs-hash:20081123190555-099f7-cd09b07e99355e2f61562324221840f869fea5bb.gz
Diffstat (limited to 'actions/peoplesearch.php')
-rw-r--r--actions/peoplesearch.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index f4886fd83..2e54233ec 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 {