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 /include/api.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 'include/api.php')
| -rw-r--r-- | include/api.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/api.php b/include/api.php index f240b60bf..3f01b90af 100644 --- a/include/api.php +++ b/include/api.php @@ -599,7 +599,7 @@ require_once('include/security.php'); if(ctype_digit($parent)) $_REQUEST['parent'] = $parent; else - $_REQUEST['parent_uri'] = $parent; + $_REQUEST['parent_mid'] = $parent; if(requestdata('lat') && requestdata('long')) $_REQUEST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long')); @@ -892,7 +892,7 @@ require_once('include/security.php'); and item_private = 0 and uid in ( " . stream_perms_api_uids() . " ) $sql_extra - AND id > %d group by uri + AND id > %d group by mid order by received desc LIMIT %d, %d ", intval($since_id), intval($start), @@ -1404,7 +1404,7 @@ require_once('include/security.php'); $status2 = array( 'updated' => api_date($item['edited']), 'published' => api_date($item['created']), - 'message_id' => $item['uri'], + 'message_id' => $item['mid'], 'url' => $item['plink'], 'coordinates' => $item['coord'], 'place' => $item['location'], @@ -1653,10 +1653,10 @@ require_once('include/security.php'); $replyto = ''; $sub = ''; if (x($_REQUEST,'replyto')) { - $r = q('SELECT `parent_uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', + $r = q('SELECT `parent_mid`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', intval(api_user()), intval($_REQUEST['replyto'])); - $replyto = $r[0]['parent_uri']; + $replyto = $r[0]['parent_mid']; $sub = $r[0]['title']; } else { @@ -1708,7 +1708,7 @@ require_once('include/security.php'); $sql_extra = "`from-url`='".dbesc( $profile_url )."'"; } elseif ($box=="conversation") { - $sql_extra = "`parent_uri`='".dbesc( $_GET["uri"] ) ."'"; + $sql_extra = "`parent_mid`='".dbesc( $_GET["uri"] ) ."'"; } elseif ($box=="all") { $sql_extra = "true"; |