diff options
author | millette <millette@controlyourself.ca> | 2008-11-23 14:05:55 -0500 |
---|---|---|
committer | millette <millette@controlyourself.ca> | 2008-11-23 14:05:55 -0500 |
commit | 095ff0feedac05e8dee04927bf4da0ae3ffb6a62 (patch) | |
tree | 3084df345e57f96e036e0c704d998dd6e290f61f | |
parent | 6b29f6ed702f69a9b1b6a9359c1eaa22b9c5ba9d (diff) |
conflict resolution on people search
darcs-hash:20081123190555-099f7-cd09b07e99355e2f61562324221840f869fea5bb.gz
-rw-r--r-- | actions/peoplesearch.php | 2 | ||||
-rw-r--r-- | lib/common.php | 2 |
2 files changed, 2 insertions, 2 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 { diff --git a/lib/common.php b/lib/common.php index 9b4751c9f..e710ce484 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); |