diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 19:45:39 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 19:45:39 -0700 |
| commit | cb76fb8b9b659c4ec06e359f375a35a534927b99 (patch) | |
| tree | cb5a77aa95ea6e510e9e1ccb33238d6de0957ec7 /mod | |
| parent | 833098e3460e0a2c7fbffaa59163af815f419e68 (diff) | |
| download | volse-hubzilla-cb76fb8b9b659c4ec06e359f375a35a534927b99.tar.gz volse-hubzilla-cb76fb8b9b659c4ec06e359f375a35a534927b99.tar.bz2 volse-hubzilla-cb76fb8b9b659c4ec06e359f375a35a534927b99.zip | |
item flag fixes discovered after a few merges
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/branchtopic.php | 3 | ||||
| -rw-r--r-- | mod/editpost.php | 2 | ||||
| -rw-r--r-- | mod/public.php | 2 | ||||
| -rw-r--r-- | mod/search.php | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/mod/branchtopic.php b/mod/branchtopic.php index 609cb19ec..d49bbaf4c 100644 --- a/mod/branchtopic.php +++ b/mod/branchtopic.php @@ -33,8 +33,7 @@ function branchtopic_init(&$a) { intval(local_channel()) ); - $x = q("update item set parent = id, route = '', item_flags = (item_flags | %d) where id = %d", - intval(ITEM_THREAD_TOP), + $x = q("update item set parent = id, route = '', item_thread_top = 1 where id = %d", intval($item_id) ); diff --git a/mod/editpost.php b/mod/editpost.php index 66196b2d2..8e4b37103 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -126,7 +126,7 @@ function editpost_content(&$a) { '$noloc' => t('Clear browser location'), '$voting' => t('Toggle voting'), '$feature_voting' => $voting, - '$consensus' => (($itm[0]['item_flags'] & ITEM_CONSENSUS) ? 1 : 0), + '$consensus' => intval($itm[0]['item_consensus']), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$ptyp' => $itm[0]['type'], diff --git a/mod/public.php b/mod/public.php index fe3f3aa21..2106be7a6 100644 --- a/mod/public.php +++ b/mod/public.php @@ -71,7 +71,7 @@ function public_content(&$a, $update = 0, $load = false) { require_once('include/security.php'); if(get_config('system','site_firehose')) { - $uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0 and (item_flags & " . intval(ITEM_WALL) . " ) > 0 "; + $uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0 and item_wall = 1 "; } else { $sys = get_sys_channel(); diff --git a/mod/search.php b/mod/search.php index 0363a225f..dceb7d72a 100644 --- a/mod/search.php +++ b/mod/search.php @@ -172,7 +172,6 @@ function search_content(&$a,$update = 0, $load = false) { $item_normal $sql_extra $suffix $pager_sql", - intval(ITEM_OBSCURED), dbesc($sys['xchan_hash']) ); } |