diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-06 14:14:40 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-06 14:14:40 +0200 |
| commit | 655290b022f0443a121790ef7f0c1d4ddeecb289 (patch) | |
| tree | 603e88df90c10ba5cc87d5bea90cb530459b70d0 /include/items.php | |
| parent | 25aded6b9b137a32d9f9ea68baf3e2102fb293e7 (diff) | |
| parent | cfbd2fc85c6e428f87c5e8d529c98e3e89202f2a (diff) | |
| download | volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.tar.gz volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.tar.bz2 volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.zip | |
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
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; |