diff options
author | friendica <info@friendica.com> | 2013-03-21 18:25:41 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-03-21 18:25:41 -0700 |
commit | ddf5bf8968a12501939cd37898d303967b748600 (patch) | |
tree | 9ec457948c7fadae811b1af676257c43bab93d4c /mod/poke.php | |
parent | b3c699d49a5ef2023fcbdaa8226be95fce9589a7 (diff) | |
download | volse-hubzilla-ddf5bf8968a12501939cd37898d303967b748600.tar.gz volse-hubzilla-ddf5bf8968a12501939cd37898d303967b748600.tar.bz2 volse-hubzilla-ddf5bf8968a12501939cd37898d303967b748600.zip |
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
Diffstat (limited to 'mod/poke.php')
-rwxr-xr-x | mod/poke.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/poke.php b/mod/poke.php index 163ef0cd8..1738fd8dd 100755 --- a/mod/poke.php +++ b/mod/poke.php @@ -46,14 +46,14 @@ function poke_init(&$a) { $target = $r[0]; if($parent) { - $r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid + $r = q("select mid, private, allow_cid, allow_gid, deny_cid, deny_gid from item where id = %d and parent = %d and uid = %d limit 1", intval($parent), intval($parent), intval($uid) ); if(count($r)) { - $parent_uri = $r[0]['uri']; + $parent_mid = $r[0]['mid']; $private = $r[0]['private']; $allow_cid = $r[0]['allow_cid']; $allow_gid = $r[0]['allow_gid']; @@ -76,13 +76,13 @@ function poke_init(&$a) { $poster = $a->contact; - $uri = item_message_id(); + $mid = item_message_id(); $arr = array(); $arr['uid'] = $uid; - $arr['uri'] = $uri; - $arr['parent_uri'] = (($parent_uri) ? $parent_uri : $uri); + $arr['mid'] = $mid; + $arr['parent_mid'] = (($parent_mid) ? $parent_mid : $mid); $arr['type'] = 'activity'; $arr['wall'] = 1; $arr['contact-id'] = $poster['id']; |