Merge remote-tracking branch 'upstream/dev' into wiki

3 files changed, 19 insertions, 20 deletions

diff --git a/include/bbcode.php b/include/bbcode.php
index ed332146f..42741b392 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -66,19 +66,6 @@ function bb_unspacefy_and_trim($st) {
 }
 
 
-function bb_emoji($mtch) {
-	$s = strtolower($mtch[1]);
-	if(strpos($s,'x')) {
-		$e = substr($s,strpos($s,'x')+1);
-		if(file_exists('images/emoji/' . $e . '.png')) {
-			return '<img width="24" height="24" src="' . z_root() . '/images/emoji/' . $e . '.png" alt="emoji" />';
-		}
-		else {
-			return $mtch[0];
-		}
-	}
-}
-
 function bb_extract_images($body) {
 
 	$saved_image = array();
@@ -1014,7 +1001,6 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text);
 	}
 
-	$Text = preg_replace_callback('/\[\&amp\;([#a-z0-9]+)\;\]/', 'bb_emoji', $Text);
 	$Text = preg_replace('/\[\&amp\;([#a-z0-9]+)\;\]/', '&$1;', $Text);
 
 	// fix any escaped ampersands that may have been converted into links
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;
diff --git a/include/text.php b/include/text.php
index 72db9c5ea..1bc19da34 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1115,8 +1115,8 @@ function list_smilies() {
 		':coffee', 
 		':facepalm',
 		':like',
-		':dislike'
-
+		':dislike',
+		':hubzilla'
 	);
 
 	$icons = array(
@@ -1152,9 +1152,24 @@ function list_smilies() {
 		'<img class="smiley" src="' . z_root() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
 		'<img class="smiley" src="' . z_root() . '/images/like.gif" alt=":like" />',
 		'<img class="smiley" src="' . z_root() . '/images/dislike.gif" alt=":dislike" />',
+		'<img class="smiley" src="' . z_root() . '/images/hz-16.png" alt=":hubzilla" />',
 
 	);
 
+	$x = get_config('feature','emoji');
+	if($x === false)
+		$x = 1;
+	if($x) {
+		if(! App::$emojitab)
+			App::$emojitab = json_decode(file_get_contents('library/emoji.json'),true);
+		foreach(App::$emojitab as $e) {
+			if(strpos($e['shortname'],':tone') === 0)
+				continue;
+			$texts[] = $e['shortname'];
+			$icons[] = '<img class="smiley emoji" height="16" width="16" src="images/emoji/' . $e['unicode'] . '.png' . '" alt="' . $e['name'] . '" />';
+		}
+	}
+
 	$params = array('texts' => $texts, 'icons' => $icons);
 	call_hooks('smilie', $params);