aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-21 20:51:07 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-21 20:51:07 -0700
commitae6612025dcd31349056364d0c701bfda58470db (patch)
treec67db564af1d2368344205fda2889f336dd14925 /include/items.php
parent33c9d8e06b2af512d25b0c9063ce58d86b72f747 (diff)
parent0ad71b3efa7de4eb1f4313ffe4562ec83743bdc1 (diff)
downloadvolse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.gz
volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.bz2
volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: include/items.php util/messages.po
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 ca7ceae42..73cb69342 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2592,6 +2592,7 @@ function item_store_update($arr,$allow_exec = false) {
$arr['item_blocked'] = ((array_key_exists('item_blocked',$arr)) ? intval($arr['item_blocked']) : $orig[0]['item_blocked'] );
+
$arr['sig'] = ((x($arr,'sig')) ? $arr['sig'] : '');
$arr['layout_mid'] = ((array_key_exists('layout_mid',$arr)) ? dbesc($arr['layout_mid']) : $orig[0]['layout_mid'] );
@@ -2635,12 +2636,11 @@ function item_store_update($arr,$allow_exec = false) {
return $ret;
}
- $r = q("delete from term where oid = %d and otype = %d",
- intval($orig_post_id),
- intval(TERM_OBJ_POST)
- );
-
- if(($terms) && (is_array($terms))) {
+ if(is_array($terms)) {
+ $r = q("delete from term where oid = %d and otype = %d",
+ intval($orig_post_id),
+ intval(TERM_OBJ_POST)
+ );
foreach($terms as $t) {
q("insert into term (uid,oid,otype,type,term,url)
values(%d,%d,%d,%d,'%s','%s') ",
@@ -2667,6 +2667,8 @@ function item_store_update($arr,$allow_exec = false) {
return $ret;
}
+
+
function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id, $walltowall = false) {
// We won't be able to sign Diaspora comments for authenticated visitors