diff options
| author | friendica <info@friendica.com> | 2011-12-11 20:03:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-11 20:03:46 -0800 |
| commit | 50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba (patch) | |
| tree | 1d67ee1261c481ac6423cd3897dbba40c75c0de1 /include | |
| parent | 3da3cd686cc7fa51e2c98e98dbf8bd3a65880bdd (diff) | |
| parent | 834639ebab3daded63c3ed076273e69b798ced90 (diff) | |
| download | volse-hubzilla-50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba.tar.gz volse-hubzilla-50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba.tar.bz2 volse-hubzilla-50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba.zip | |
Merge branch 'master' into notify
Diffstat (limited to 'include')
| -rw-r--r-- | include/network.php | 3 | ||||
| -rw-r--r-- | include/text.php | 3 |
2 files changed, 5 insertions, 1 deletions
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="','"/>'),array('href="','"/>'),$xml); + $h = parse_xml_string($xml); if(! $h) return array(); 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( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', + array( '<3', '</3', '<\\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>', |