aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-06-20 08:57:21 +1000
committerRedMatrix <info@friendica.com>2014-06-20 08:57:21 +1000
commit4c0b8bc637fe6773f8053b1672122c18a5788986 (patch)
treeb0513171eccb338c55b7d1a50da0f67e6e8b6f65 /include/items.php
parentc012c648e0691868370a5a8c1eb468020fef6330 (diff)
parentb20887995a2b3277659e01d99ae4de238f7175ef (diff)
downloadvolse-hubzilla-4c0b8bc637fe6773f8053b1672122c18a5788986.tar.gz
volse-hubzilla-4c0b8bc637fe6773f8053b1672122c18a5788986.tar.bz2
volse-hubzilla-4c0b8bc637fe6773f8053b1672122c18a5788986.zip
Merge pull request #498 from solstag/perms_pending
Implements a new permission level PERMS_PENDING
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/items.php b/include/items.php
index f71ebd503..c35a442b2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -943,6 +943,8 @@ function map_scope($scope) {
return 'network: red';
case PERMS_SITE:
return 'site: ' . get_app()->get_hostname();
+ case PERMS_PENDING:
+ return 'any connections';
case PERMS_CONTACTS:
default:
return 'contacts';
@@ -4085,7 +4087,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
if(! array_key_exists('nouveau',$arr)) {
- $sql_extra2 = " AND item.parent = item.id ";
+ $sql_extra2 = " AND item.parent = item.id ";
$sql_extra3 = '';
}
@@ -4126,12 +4128,12 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$pager_sql = sprintf(" LIMIT %d, %d ",intval($arr['start']), intval($arr['records']));
if(array_key_exists('cmin',$arr) || array_key_exists('cmax',$arr)) {
- if(($arr['cmin'] != 0) || ($arr['cmax'] != 99)) {
+ if(($arr['cmin'] != 0) || ($arr['cmax'] != 99)) {
- // Not everybody who shows up in the network stream will be in your address book.
- // By default those that aren't are assumed to have closeness = 99; but this isn't
- // recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
- // the stream with a NULL address book entry.
+ // Not everybody who shows up in the network stream will be in your address book.
+ // By default those that aren't are assumed to have closeness = 99; but this isn't
+ // recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
+ // the stream with a NULL address book entry.
$sql_nets .= " AND ";