aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-12-05 20:16:19 -0500
committerAndrew Manning <tamanning@zoho.com>2016-12-05 20:16:19 -0500
commit8ba5cbc2b99ffed424d085b6365cbc07309ad573 (patch)
tree865cdc545673e1f5781a2ec42dbb6015ac251cf2 /include/items.php
parent3b3da24823defd89f4ed256b7c45df8b71cb0627 (diff)
parentfbf13dde213dcecfdc6c6e5d95b165bb46eda85a (diff)
downloadvolse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.gz
volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.tar.bz2
volse-hubzilla-8ba5cbc2b99ffed424d085b6365cbc07309ad573.zip
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php22
1 files changed, 9 insertions, 13 deletions
diff --git a/include/items.php b/include/items.php
index 215f70031..3bbd4cce3 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3980,8 +3980,8 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$sql_nets .= "( abook.abook_closeness >= " . intval($arr['cmin']) . " ";
$sql_nets .= " AND abook.abook_closeness <= " . intval($arr['cmax']) . " ) ";
- /** @fixme dead code, $cmax is undefined */
- if ($cmax == 99)
+
+ if ($arr['cmax'] == 99)
$sql_nets .= " OR abook.abook_closeness IS NULL ) ";
}
}
@@ -4116,25 +4116,21 @@ function webpage_to_namespace($webpage) {
function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid) {
- $page_type = '';
-
if(! $post_id)
return;
- if($webpage == ITEM_TYPE_WEBPAGE)
- $page_type = 'WEBPAGE';
- elseif($webpage == ITEM_TYPE_BLOCK)
- $page_type = 'BUILDBLOCK';
- elseif($webpage == ITEM_TYPE_PDL)
- $page_type = 'PDL';
- elseif($webpage == ITEM_TYPE_DOC)
- $page_type = 'docfile';
- elseif($namespace && $remote_id) {
+ $page_type = webpage_to_namespace($webpage);
+
+ if($page_type == 'unknown' && $namespace && $remote_id) {
$page_type = $namespace;
$pagetitle = $remote_id;
}
+ else {
+ $page_type = '';
+ }
if($page_type) {
+
// store page info as an alternate message_id so we can access it via
// https://sitename/page/$channelname/$pagetitle
// if no pagetitle was given or it couldn't be transliterated into a url, use the first