X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Ftext.php;h=4726872ec299f4656770d8be29df5dac883093a2;hb=573670fa0c8a3d8f111430985d263499b79a6ac0;hp=e0f38a3a0d4b8bf9ec53610459d7e0ca797f28b8;hpb=72d74b88be0e9a25920d336c7eab0aeb09342f63;p=friendica.git

diff --git a/include/text.php b/include/text.php
index e0f38a3a0d..4726872ec2 100644
--- a/include/text.php
+++ b/include/text.php
@@ -672,7 +672,7 @@ function smilies($s) {
 
 	$s = str_replace(
 	array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', 
-		'~friendika', 'Diaspora*' ),
+		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
@@ -691,6 +691,7 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
+		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
 
 	), $s);
@@ -1052,4 +1053,13 @@ function html2bb_video($s) {
 			'[vimeo]$2[/vimeo]', $s);
 
 	return $s;
-}
\ No newline at end of file
+}
+
+/**
+ * apply xmlify() to all values of array $val, recursively
+ */
+function array_xmlify($val){
+	if (is_bool($val)) return $val?"true":"false";
+	if (is_array($val)) return array_map('array_xmlify', $val);
+	return xmlify((string) $val);
+}