From 5b3155579ad58c16daa6a3c7c69d53482357c506 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 9 Dec 2011 16:46:18 -0800
Subject: fix diaspora's illegal webfinger xml before sending to parser

---
 include/network.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/network.php b/include/network.php
index 78ed24074..551d5e1d0 100644
--- a/include/network.php
+++ b/include/network.php
@@ -535,6 +535,9 @@ function fetch_xrd_links($url) {
 	if ((! $xml) || (! stristr($xml,'<xrd')))
 		return array();
 
+	// fix diaspora's bad xml
+	$xml = str_replace(array('href=&quot;','&quot;/>'),array('href="','"/>'),$xml);
+
 	$h = parse_xml_string($xml);
 	if(! $h)
 		return array();
-- 
cgit v1.2.3


From 834639ebab3daded63c3ed076273e69b798ced90 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 11 Dec 2011 16:58:36 -0800
Subject: \o/ smiley

---
 include/text.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/text.php b/include/text.php
index 29e53c663..04d5dfced 100644
--- a/include/text.php
+++ b/include/text.php
@@ -674,7 +674,7 @@ function smilies($s) {
 	$a = get_app();
 
 	$s = str_replace(
-	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', 
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/',
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -693,6 +693,7 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\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>',
-- 
cgit v1.2.3