From ecb300177cf6996170a77880d771f0aa20f2cf11 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 26 May 2011 23:10:40 -0700
Subject: troublesome feed was a 307 redirect. We didn't recognise 307

---
 boot.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 7d96eac9f..104e20f56 100644
--- a/boot.php
+++ b/boot.php
@@ -682,7 +682,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
 		$s = substr($s,strlen($header)+4);
 		$header = substr($s,0,strpos($s,"\r\n\r\n"));
 	}
-	if($http_code == 301 || $http_code == 302 || $http_code == 303) {
+	if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
         $matches = array();
         preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
         $url = trim(array_pop($matches));
@@ -2196,12 +2196,13 @@ function smilies($s) {
 	$a = get_app();
 
 	return 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'),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />',
-- 
cgit v1.2.3