diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
| commit | bdd275474044152a5d9a33ea6b8a8071b931d27e (patch) | |
| tree | b10c2b68e0236925992449786d70f45aaca21984 /mod/acl.php | |
| parent | 792edfe9c834e3daeae598727e4cb15dc0ff8475 (diff) | |
| parent | e894775a39920edc0e438364c818357ab809bace (diff) | |
| download | volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.gz volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.bz2 volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'mod/acl.php')
| -rwxr-xr-x | mod/acl.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/acl.php b/mod/acl.php index 375c618c8..fe353d1eb 100755 --- a/mod/acl.php +++ b/mod/acl.php @@ -7,10 +7,10 @@ function acl_init(&$a){ return ""; - $start = (x($_POST,'start')?$_POST['start']:0); - $count = (x($_POST,'count')?$_POST['count']:100); - $search = (x($_POST,'search')?$_POST['search']:""); - $type = (x($_POST,'type')?$_POST['type']:""); + $start = (x($_REQUEST,'start')?$_REQUEST['start']:0); + $count = (x($_REQUEST,'count')?$_REQUEST['count']:100); + $search = (x($_REQUEST,'search')?$_REQUEST['search']:""); + $type = (x($_REQUEST,'type')?$_REQUEST['type']:""); if ($search!=""){ @@ -34,7 +34,7 @@ function acl_init(&$a){ $r = q("SELECT COUNT(`id`) AS c FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 - AND `notify` != '' $sql_extra" , + AND `notify` != '' $sql_extra2" , intval(local_user()) ); $contact_count = (int)$r[0]['c']; |