diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-05 16:52:02 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-05 16:52:02 -0400 |
| commit | 08a9553ccc0fd883a77fbf36be5941ba119deda1 (patch) | |
| tree | d9ec5063c463f135c51d34fa2963a69965a8aad2 /include/items.php | |
| parent | 0a3fbdd128dd3b80868c93cb93901b501edf576c (diff) | |
| parent | dd6718c2cdf2cadaf7478b848eb892dcda1dc7e9 (diff) | |
| download | volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.gz volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.bz2 volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index f473b2bac..93385c6e6 100755 --- a/include/items.php +++ b/include/items.php @@ -1183,7 +1183,7 @@ function encode_item_terms($terms,$mirror = false) { if($terms) { foreach($terms as $term) { if(in_array($term['ttype'],$allowed_export_terms)) - $ret[] = array('tag' => $term['term'], 'url' => $term['url'], 'ttype' => termtype($term['type'])); + $ret[] = array('tag' => $term['term'], 'url' => $term['url'], 'type' => termtype($term['ttype'])); } } @@ -1240,11 +1240,9 @@ function decode_tags($t) { $ret = array(); foreach($t as $x) { $tag = array(); - if(array_key_exists('type',$x)) - $x['ttype'] = $x['type']; $tag['term'] = htmlspecialchars($x['tag'], ENT_COMPAT, 'UTF-8', false); $tag['url'] = htmlspecialchars($x['url'], ENT_COMPAT, 'UTF-8', false); - switch($x['ttype']) { + switch($x['type']) { case 'hashtag': $tag['ttype'] = TERM_HASHTAG; break; |