aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Import/refimport.php4
-rw-r--r--include/api.php17
-rwxr-xr-xinclude/diaspora.php2
-rwxr-xr-xinclude/items.php11
-rw-r--r--include/zot.php3
5 files changed, 9 insertions, 28 deletions
diff --git a/include/Import/refimport.php b/include/Import/refimport.php
index 7d32e143f..3ef8870ac 100644
--- a/include/Import/refimport.php
+++ b/include/Import/refimport.php
@@ -260,11 +260,7 @@ function reflect_comment_store($channel,$post,$comment,$user) {
$arr['edited'] = $comment['created'];
$arr['author_xchan'] = $hash;
$arr['owner_xchan'] = $channel['channel_hash'];
-<<<<<<< HEAD
$arr['item_origin'] = 1;
-=======
- $arr['item_flags'] = ITEM_ORIGIN;
->>>>>>> master
$arr['item_wall'] = 1;
$arr['verb'] = ACTIVITY_POST;
$arr['comment_policy'] = 'contacts';
diff --git a/include/api.php b/include/api.php
index effaa4484..e72344ff7 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1547,8 +1547,8 @@ require_once('include/items.php');
}
$item = q("SELECT * FROM item WHERE id = %d AND uid = %d",
- intval($itemid),
- intval(api_user())
+ intval($itemid),
+ intval(api_user())
);
if (! $item)
@@ -1556,19 +1556,16 @@ require_once('include/items.php');
switch($action){
case "create":
-
- $flags = $item[0]['item_flags'] | ITEM_STARRED;
-
+ $flags = $item[0]['item_starred'] = 1;
break;
case "destroy":
-
- $flags = $item[0]['item_flags'] | (~ ITEM_STARRED);
+ $flags = $item[0]['item_starred'] = 0;
break;
default:
return false;
}
- $r = q("UPDATE item SET item_flags = %d where id = %d and uid = %d",
+ $r = q("UPDATE item SET item_starred = %d where id = %d and uid = %d",
intval($flags),
intval($itemid),
intval(api_user())
@@ -1577,8 +1574,8 @@ require_once('include/items.php');
return false;
$item = q("SELECT * FROM item WHERE id = %d AND uid = %d",
- intval($itemid),
- intval(api_user())
+ intval($itemid),
+ intval(api_user())
);
xchan_query($item,true);
diff --git a/include/diaspora.php b/include/diaspora.php
index f46ddc764..997cbb187 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2456,7 +2456,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
}
*/
- if($item['item_flags'] & ITEM_CONSENSUS) {
+ if(intval($item['item_consensus'])) {
$poll = replace_macros(get_markup_template('diaspora_consensus.tpl'), array(
'$guid_q' => random_string(),
'$question' => t('Please choose'),
diff --git a/include/items.php b/include/items.php
index 3a86717bb..ee8ce5575 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3225,17 +3225,6 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
$title = $item['title'];
$body = $item['body'];
- if(! $private) {
- if($flag_bits & ITEM_OBSCURED) {
- $key = get_config('system','prvkey');
- if($title)
- $title = crypto_unencapsulate(json_decode($title,true),$key);
- if($body)
- $body = crypto_unencapsulate(json_decode($body,true),$key);
- $item_obscured = 0;
- }
- }
-
$r = q("update item set item_uplink = %d, item_nocomment = %d, item_obscured = %d, item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s', item_wall = %d, item_origin = %d where id = %d",
intval($item_uplink),
diff --git a/include/zot.php b/include/zot.php
index 309df252d..2187f3103 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1373,8 +1373,7 @@ function public_recips($msg) {
if($msg['message']['message_top']) {
$z = q("select owner_xchan as hash from item where parent_mid = '%s' ",
- dbesc($msg['message']['message_top']),
- intval(ITEM_UPLINK)
+ dbesc($msg['message']['message_top'])
);
if($z)
$r = array_merge($r,$z);